Message ID | 20091005090103.0340ef29@s6510 |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, 2009-10-05 at 09:01 -0700, Stephen Hemminger wrote: > The data center bridging ops structure can be const > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> > Thanks Stephen, that was an oversight. Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > --- a/drivers/net/ixgbe/ixgbe.h 2009-10-03 21:40:25.712809970 -0700 > +++ b/drivers/net/ixgbe/ixgbe.h 2009-10-03 21:40:33.490342038 -0700 > @@ -397,7 +397,7 @@ enum ixgbe_boards { > extern struct ixgbe_info ixgbe_82598_info; > extern struct ixgbe_info ixgbe_82599_info; > #ifdef CONFIG_IXGBE_DCB > -extern struct dcbnl_rtnl_ops dcbnl_ops; > +extern const struct dcbnl_rtnl_ops dcbnl_ops; > extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg, > struct ixgbe_dcb_config *dst_dcb_cfg, > int tc_max); > --- a/drivers/net/ixgbe/ixgbe_dcb_nl.c 2009-10-03 21:39:54.710299317 -0700 > +++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c 2009-10-03 21:40:05.990317034 -0700 > @@ -563,7 +563,7 @@ static u8 ixgbe_dcbnl_setapp(struct net_ > return rval; > } > > -struct dcbnl_rtnl_ops dcbnl_ops = { > +const struct dcbnl_rtnl_ops dcbnl_ops = { > .getstate = ixgbe_dcbnl_get_state, > .setstate = ixgbe_dcbnl_set_state, > .getpermhwaddr = ixgbe_dcbnl_get_perm_hw_addr, > --- a/include/linux/netdevice.h 2009-10-03 21:40:52.730300256 -0700 > +++ b/include/linux/netdevice.h 2009-10-03 21:41:10.362812001 -0700 > @@ -909,7 +909,7 @@ struct net_device > > #ifdef CONFIG_DCB > /* Data Center Bridging netlink ops */ > - struct dcbnl_rtnl_ops *dcbnl_ops; > + const struct dcbnl_rtnl_ops *dcbnl_ops; > #endif > > #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Date: Mon, 05 Oct 2009 13:08:18 -0700 > On Mon, 2009-10-05 at 09:01 -0700, Stephen Hemminger wrote: >> The data center bridging ops structure can be const >> >> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> >> > > Thanks Stephen, that was an oversight. > > Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/net/ixgbe/ixgbe.h 2009-10-03 21:40:25.712809970 -0700 +++ b/drivers/net/ixgbe/ixgbe.h 2009-10-03 21:40:33.490342038 -0700 @@ -397,7 +397,7 @@ enum ixgbe_boards { extern struct ixgbe_info ixgbe_82598_info; extern struct ixgbe_info ixgbe_82599_info; #ifdef CONFIG_IXGBE_DCB -extern struct dcbnl_rtnl_ops dcbnl_ops; +extern const struct dcbnl_rtnl_ops dcbnl_ops; extern int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg, struct ixgbe_dcb_config *dst_dcb_cfg, int tc_max); --- a/drivers/net/ixgbe/ixgbe_dcb_nl.c 2009-10-03 21:39:54.710299317 -0700 +++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c 2009-10-03 21:40:05.990317034 -0700 @@ -563,7 +563,7 @@ static u8 ixgbe_dcbnl_setapp(struct net_ return rval; } -struct dcbnl_rtnl_ops dcbnl_ops = { +const struct dcbnl_rtnl_ops dcbnl_ops = { .getstate = ixgbe_dcbnl_get_state, .setstate = ixgbe_dcbnl_set_state, .getpermhwaddr = ixgbe_dcbnl_get_perm_hw_addr, --- a/include/linux/netdevice.h 2009-10-03 21:40:52.730300256 -0700 +++ b/include/linux/netdevice.h 2009-10-03 21:41:10.362812001 -0700 @@ -909,7 +909,7 @@ struct net_device #ifdef CONFIG_DCB /* Data Center Bridging netlink ops */ - struct dcbnl_rtnl_ops *dcbnl_ops; + const struct dcbnl_rtnl_ops *dcbnl_ops; #endif #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
The data center bridging ops structure can be const Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html