aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-10-05 02:01:03 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-07 04:10:47 -0400
commit32953543221cfe2bf0a24205fab225e5b8ed81a0 (patch)
tree48343bcd03f897a97fde1dd597205e8323d1323a
parentec1b4cf74c81bfd0fbe5bf62bafc86c45917e72f (diff)
dcb: data center bridging ops should be r/o
The data center bridging ops structure can be const Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ixgbe/ixgbe.h2
-rw-r--r--drivers/net/ixgbe/ixgbe_dcb_nl.c2
-rw-r--r--include/linux/netdevice.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 385be6016667..28f32da794dd 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -397,7 +397,7 @@ enum ixgbe_boards {
397extern struct ixgbe_info ixgbe_82598_info; 397extern struct ixgbe_info ixgbe_82598_info;
398extern struct ixgbe_info ixgbe_82599_info; 398extern struct ixgbe_info ixgbe_82599_info;
399#ifdef CONFIG_IXGBE_DCB 399#ifdef CONFIG_IXGBE_DCB
400extern struct dcbnl_rtnl_ops dcbnl_ops; 400extern const struct dcbnl_rtnl_ops dcbnl_ops;
401extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg, 401extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
402 struct ixgbe_dcb_config *dst_dcb_cfg, 402 struct ixgbe_dcb_config *dst_dcb_cfg,
403 int tc_max); 403 int tc_max);
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index a6bc1ef28f92..3c7a79a7d7c6 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -563,7 +563,7 @@ static u8 ixgbe_dcbnl_setapp(struct net_device *netdev,
563 return rval; 563 return rval;
564} 564}
565 565
566struct dcbnl_rtnl_ops dcbnl_ops = { 566const struct dcbnl_rtnl_ops dcbnl_ops = {
567 .getstate = ixgbe_dcbnl_get_state, 567 .getstate = ixgbe_dcbnl_get_state,
568 .setstate = ixgbe_dcbnl_set_state, 568 .setstate = ixgbe_dcbnl_set_state,
569 .getpermhwaddr = ixgbe_dcbnl_get_perm_hw_addr, 569 .getpermhwaddr = ixgbe_dcbnl_get_perm_hw_addr,
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 94958c109761..b332eefebb1b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -909,7 +909,7 @@ struct net_device
909 909
910#ifdef CONFIG_DCB 910#ifdef CONFIG_DCB
911 /* Data Center Bridging netlink ops */ 911 /* Data Center Bridging netlink ops */
912 struct dcbnl_rtnl_ops *dcbnl_ops; 912 const struct dcbnl_rtnl_ops *dcbnl_ops;
913#endif 913#endif
914 914
915#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) 915#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)