diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 17:12:37 +1000 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /net/atm/lec.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
| download | kernel-crypto-8725f25acc656c1522d48a6746055099efdaca4c.tar.gz kernel-crypto-8725f25acc656c1522d48a6746055099efdaca4c.tar.xz kernel-crypto-8725f25acc656c1522d48a6746055099efdaca4c.zip | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'net/atm/lec.h')
| -rw-r--r-- | net/atm/lec.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/atm/lec.h b/net/atm/lec.h index b41cda7ea1e..0d376682c1a 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h @@ -42,12 +42,12 @@ struct lecdatahdr_8025 { * */ struct lane2_ops { - int (*resolve) (struct net_device *dev, u8 *dst_mac, int force, + int (*resolve) (struct net_device *dev, const u8 *dst_mac, int force, u8 **tlvs, u32 *sizeoftlvs); - int (*associate_req) (struct net_device *dev, u8 *lan_dst, - u8 *tlvs, u32 sizeoftlvs); - void (*associate_indicator) (struct net_device *dev, u8 *mac_addr, - u8 *tlvs, u32 sizeoftlvs); + int (*associate_req) (struct net_device *dev, const u8 *lan_dst, + const u8 *tlvs, u32 sizeoftlvs); + void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr, + const u8 *tlvs, u32 sizeoftlvs); }; /* |