diff options
Diffstat (limited to 'patches/0033-ndo_vlan_rx_vid/cdc_mbim.patch')
| -rw-r--r-- | patches/0033-ndo_vlan_rx_vid/cdc_mbim.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/patches/0033-ndo_vlan_rx_vid/cdc_mbim.patch b/patches/0033-ndo_vlan_rx_vid/cdc_mbim.patch index 362b544b..2441af6e 100644 --- a/patches/0033-ndo_vlan_rx_vid/cdc_mbim.patch +++ b/patches/0033-ndo_vlan_rx_vid/cdc_mbim.patch @@ -4,13 +4,13 @@ return cdc_mbim_manage_power(dev, status); } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) ++#if LINUX_VERSION_IS_GEQ(3,10,0) static int cdc_mbim_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 cdc_mbim_rx_add_vid(struct net_device *netdev, u16 vid) +#else +static void cdc_mbim_rx_add_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 usbnet *dev = netdev_priv(netdev); struct cdc_mbim_state *info = (void *)&dev->data; @@ -18,21 +18,21 @@ /* creation of this VLAN is a request to tag IP session 0 */ if (vid == MBIM_IPS0_VID) info->flags |= FLAG_IPS0_VLAN; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++#if LINUX_VERSION_IS_GEQ(3,3,0) else if (vid >= 512) /* we don't map these to MBIM session */ return -EINVAL; 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 cdc_mbim_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 cdc_mbim_rx_kill_vid(struct net_device *netdev, u16 vid) +#else +static void cdc_mbim_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 usbnet *dev = netdev_priv(netdev); struct cdc_mbim_state *info = (void *)&dev->data; @@ -40,9 +40,9 @@ /* this is a request for an untagged IP session 0 */ if (vid == MBIM_IPS0_VID) info->flags &= ~FLAG_IPS0_VLAN; -+#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 const struct net_device_ops cdc_mbim_netdev_ops = { |