diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-02-07 23:04:11 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-02-09 14:52:26 +0100 |
| commit | e13e44d9a81da4bf77d9869db5b4764fc0811d9f (patch) | |
| tree | c610ae2b0f634df75fe88f65a047e5c741c9b0af /patches/0025-usb-sg | |
| parent | 46939c43903da6b202c95a0fcb24acce55fd63c0 (diff) | |
backports: always use new version compare macros
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0025-usb-sg')
| -rw-r--r-- | patches/0025-usb-sg/usbnet.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/0025-usb-sg/usbnet.patch b/patches/0025-usb-sg/usbnet.patch index e9c204d9..1a1017c3 100644 --- a/patches/0025-usb-sg/usbnet.patch +++ b/patches/0025-usb-sg/usbnet.patch @@ -4,7 +4,7 @@ /*-------------------------------------------------------------------------*/ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,35,0) ++#if LINUX_VERSION_IS_GEQ(3,35,0) static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) { unsigned num_sgs, total_len = 0; @@ -25,7 +25,7 @@ if (!(info->flags & FLAG_SEND_ZLP)) { if (!(info->flags & FLAG_MULTI_PACKET)) { length++; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,35,0) ++#if LINUX_VERSION_IS_GEQ(3,35,0) if (skb_tailroom(skb) && !urb->num_sgs) { skb->data[skb->len] = 0; __skb_put(skb, 1); @@ -45,7 +45,7 @@ if (skb) dev_kfree_skb_any (skb); if (urb) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,35,0) ++#if LINUX_VERSION_IS_GEQ(3,35,0) kfree(urb->sg); +#endif usb_free_urb(urb); @@ -55,7 +55,7 @@ rx_process (dev, skb); continue; case tx_done: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,35,0) ++#if LINUX_VERSION_IS_GEQ(3,35,0) kfree(entry->urb->sg); +#endif case rx_cleanup: @@ -65,7 +65,7 @@ retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,35,0) ++#if LINUX_VERSION_IS_GEQ(3,35,0) kfree(res->sg); +#endif usb_free_urb(res); |