On 2011-02-17 13:46, Sebastian Smolorz wrote:
> VLAN_GROUP_ARRAY_LEN was renamed to VLAN_N_VID in kernel 2.6.37. Replace all
> occurrences of VLAN_GROUP_ARRAY_LEN in all drivers and define VLAN_N_VID for
> kernels prior to 2.6.37.
>
> Signed-off-by: Sebastian Smolorz <sm...@rt...>
> ---
> drivers/experimental/e1000/e1000_ethtool.c | 2 +-
> drivers/experimental/e1000/e1000_main.c | 2 +-
> drivers/igb/igb_main.c | 2 +-
> stack/include/rtnet_port.h | 4 ++++
> 4 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/experimental/e1000/e1000_ethtool.c b/drivers/experimental/e1000/e1000_ethtool.c
> index b891f4e..375aa7f 100644
> --- a/drivers/experimental/e1000/e1000_ethtool.c
> +++ b/drivers/experimental/e1000/e1000_ethtool.c
> @@ -378,7 +378,7 @@ static int e1000_set_tso(struct net_device *netdev, u32 data)
> /* disable TSO on all VLANs if they're present */
> if (!adapter->vlgrp)
> goto tso_out;
> - for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
> + for (i = 0; i < VLAN_N_VID; i++) {
> v_netdev = vlan_group_get_device(adapter->vlgrp, i);
> if (!v_netdev)
> continue;
> diff --git a/drivers/experimental/e1000/e1000_main.c b/drivers/experimental/e1000/e1000_main.c
> index 1bd2a72..ce7f23a 100644
> --- a/drivers/experimental/e1000/e1000_main.c
> +++ b/drivers/experimental/e1000/e1000_main.c
> @@ -6147,7 +6147,7 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)
>
> if (adapter->vlgrp) {
> u16 vid;
> - for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
> + for (vid = 0; vid < VLAN_N_VID; vid++) {
> if (!vlan_group_get_device(adapter->vlgrp, vid))
> continue;
> e1000_vlan_rx_add_vid(adapter->netdev, vid);
> diff --git a/drivers/igb/igb_main.c b/drivers/igb/igb_main.c
> index f9caeee..6272539 100644
> --- a/drivers/igb/igb_main.c
> +++ b/drivers/igb/igb_main.c
> @@ -4515,7 +4515,7 @@ static void igb_restore_vlan(struct igb_adapter *adapter)
>
> if (adapter->vlgrp) {
> u16 vid;
> - for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
> + for (vid = 0; vid < VLAN_N_VID; vid++) {
> if (!vlan_group_get_device(adapter->vlgrp, vid))
> continue;
> igb_vlan_rx_add_vid(adapter->netdev, vid);
> diff --git a/stack/include/rtnet_port.h b/stack/include/rtnet_port.h
> index 09101cc..89b8a2b 100644
> --- a/stack/include/rtnet_port.h
> +++ b/stack/include/rtnet_port.h
> @@ -222,6 +222,10 @@ static inline void *netdev_priv(struct net_device *dev)
> #define NIPQUAD_FMT "%u.%u.%u.%u"
> #endif
>
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
> +#define VLAN_N_VID VLAN_GROUP_ARRAY_LEN
> +#endif
> +
> #endif /* __KERNEL__ */
>
> #endif /* __RTNET_PORT_H_ */
Thanks, applied.
Jan
|