Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt_lede
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Aborescence: 488fc98adf
Branches Tags
openwrt_lede
/
target
/
linux
/
generic
/
patches-4.4
/
099-0004-usbnet-fix-alignment-for-frames-with-no-ethernet-hea.patch

099-0004-usbnet-fix-alignment-for-frames-with-no-ethernet-hea.patch 2.3 KB
Historique Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 
  1. From a4abd7a80addb4a9547f7dfc7812566b60ec505c Mon Sep 17 00:00:00 2001
    2. 

  2. From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
    3. 

  3. Date: Wed, 6 Dec 2017 20:21:24 +0100
    4. 

  4. Subject: [PATCH] usbnet: fix alignment for frames with no ethernet header
    5. 

  5. MIME-Version: 1.0
    6. 

  6. Content-Type: text/plain; charset=UTF-8
    7. 

  7. Content-Transfer-Encoding: 8bit
    8. 

  8. 

  9. The qmi_wwan minidriver support a 'raw-ip' mode where frames are
    10. 

  10. received without any ethernet header. This causes alignment issues
    11. 

  11. because the skbs allocated by usbnet are "IP aligned".
    12. 

  12. 

  13. Fix by allowing minidrivers to disable the additional alignment
    14. 

  14. offset. This is implemented using a per-device flag, since the same
    15. 

  15. minidriver also supports 'ethernet' mode.
    16. 

  16. 

  17. Fixes: 32f7adf633b9 ("net: qmi_wwan: support "raw IP" mode")
    18. 

  18. Reported-and-tested-by: Jay Foster <jay@systech.com>
    19. 

  19. Signed-off-by: Bjørn Mork <bjorn@mork.no>
    20. 

  20. Signed-off-by: David S. Miller <davem@davemloft.net>
    21. 

  21. ---
    22. 

  22.  drivers/net/usb/qmi_wwan.c | 2 ++
    23. 

  23.  drivers/net/usb/usbnet.c   | 5 ++++-
    24. 

  24.  include/linux/usb/usbnet.h | 1 +
    25. 

  25.  3 files changed, 7 insertions(+), 1 deletion(-)
    26. 

  26. 

  27. --- a/drivers/net/usb/qmi_wwan.c
    28. 

  28. +++ b/drivers/net/usb/qmi_wwan.c
    29. 

  29. @@ -70,9 +70,11 @@ static void qmi_wwan_netdev_setup(struct
    30. 

  30.  		net->hard_header_len = 0;
    31. 

  31.  		net->addr_len        = 0;
    32. 

  32.  		net->flags           = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
    33. 

  33. +		set_bit(EVENT_NO_IP_ALIGN, &dev->flags);
    34. 

  34.  		netdev_dbg(net, "mode: raw IP\n");
    35. 

  35.  	} else if (!net->header_ops) { /* don't bother if already set */
    36. 

  36.  		ether_setup(net);
    37. 

  37. +		clear_bit(EVENT_NO_IP_ALIGN, &dev->flags);
    38. 

  38.  		netdev_dbg(net, "mode: Ethernet\n");
    39. 

  39.  	}
    40. 

  40.  
    41. 

  41. --- a/drivers/net/usb/usbnet.c
    42. 

  42. +++ b/drivers/net/usb/usbnet.c
    43. 

  43. @@ -482,7 +482,10 @@ static int rx_submit (struct usbnet *dev
    44. 

  44.  		return -ENOLINK;
    45. 

  45.  	}
    46. 

  46.  
    47. 

  47. -	skb = __netdev_alloc_skb_ip_align(dev->net, size, flags);
    48. 

  48. +	if (test_bit(EVENT_NO_IP_ALIGN, &dev->flags))
    49. 

  49. +		skb = __netdev_alloc_skb(dev->net, size, flags);
    50. 

  50. +	else
    51. 

  51. +		skb = __netdev_alloc_skb_ip_align(dev->net, size, flags);
    52. 

  52.  	if (!skb) {
    53. 

  53.  		netif_dbg(dev, rx_err, dev->net, "no rx skb\n");
    54. 

  54.  		usbnet_defer_kevent (dev, EVENT_RX_MEMORY);
    55. 

  55. --- a/include/linux/usb/usbnet.h
    56. 

  56. +++ b/include/linux/usb/usbnet.h
    57. 

  57. @@ -79,6 +79,7 @@ struct usbnet {
    58. 

  58.  #		define EVENT_RX_KILL	10
    59. 

  59.  #		define EVENT_LINK_CHANGE	11
    60. 

  60.  #		define EVENT_SET_RX_MODE	12
    61. 

  61. +#		define EVENT_NO_IP_ALIGN	13
    62. 

  62.  };
    63. 

  63.  
    64. 

  64.  static inline struct usb_driver *driver_of(struct usb_interface *intf)
    65.