Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...

[linux-2.6-omap-h63xx.git] / net / atm / lec.h

diff --git a/net/atm/lec.h b/net/atm/lec.h
index b41cda7ea1e183804121ab9f89ab48b935e306fd..0d376682c1a321ba7837f3721555ab2dcd6ca8a0 100644 (file)
--- 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);
 };
 
 /*