diff options
Diffstat (limited to 'patches/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch')
| -rw-r--r-- | patches/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/patches/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch b/patches/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch index 5d174c29..093af647 100644 --- a/patches/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch +++ b/patches/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch @@ -4,16 +4,16 @@ static void igb_reset_task(struct work_struct *); static void igb_vlan_mode(struct net_device *netdev, netdev_features_t features); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) ++#if LINUX_VERSION_IS_GEQ(3,10,0) static int igb_vlan_rx_add_vid(struct net_device *, __be16, u16); static int igb_vlan_rx_kill_vid(struct net_device *, __be16, u16); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++#elif LINUX_VERSION_IS_GEQ(3,3,0) +static int igb_vlan_rx_add_vid(struct net_device *, u16); +static int igb_vlan_rx_kill_vid(struct net_device *, u16); +#else +static void igb_vlan_rx_add_vid(struct net_device *, u16); +static void igb_vlan_rx_kill_vid(struct net_device *, u16); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,10,0) */ static void igb_restore_vlan(struct igb_adapter *); static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8); static void igb_ping_all_vfs(struct igb_adapter *); @@ -21,10 +21,10 @@ igb_set_vf_vlan_strip(adapter, adapter->vfs_allocated_count, enable); } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) ++#if LINUX_VERSION_IS_GEQ(3,10,0) static int igb_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid) -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++#elif LINUX_VERSION_IS_GEQ(3,3,0) +static int igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid) +#else +static void igb_vlan_rx_add_vid(struct net_device *netdev, u16 vid) @@ -36,19 +36,19 @@ set_bit(vid, adapter->active_vlans); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++#if LINUX_VERSION_IS_GEQ(3,3,0) return 0; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,3,0) */ } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) ++#if LINUX_VERSION_IS_GEQ(3,10,0) static int igb_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid) -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++#elif LINUX_VERSION_IS_GEQ(3,3,0) +static int igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) +#else +static void igb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,10,0) */ { struct igb_adapter *adapter = netdev_priv(netdev); int pf_id = adapter->vfs_allocated_count; @@ -56,9 +56,9 @@ clear_bit(vid, adapter->active_vlans); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++#if LINUX_VERSION_IS_GEQ(3,3,0) return 0; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,3,0) */ } static void igb_restore_vlan(struct igb_adapter *adapter) @@ -66,18 +66,18 @@ u16 vid = 1; igb_vlan_mode(adapter->netdev, adapter->netdev->features); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) ++#if LINUX_VERSION_IS_GEQ(3,10,0) igb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0); +#else + igb_vlan_rx_add_vid(adapter->netdev, 0); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,10,0) */ for_each_set_bit_from(vid, adapter->active_vlans, VLAN_N_VID) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) ++#if LINUX_VERSION_IS_GEQ(3,10,0) igb_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid); +#else + igb_vlan_rx_add_vid(adapter->netdev, vid); -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,10,0) */ } int igb_set_spd_dplx(struct igb_adapter *adapter, u32 spd, u8 dplx) |