kernel: bump 4.14 to 4.14.169

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.14 / 950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch

diff --git a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch
index b715d70b8b95d05a94ee5490319dbe4ec272b14f..c0fd1d6e24391af99710321cf7e497e9d9153eb8 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0271-net-lan78xx-Add-support-for-VLAN-tag-stripping.patch
@@ -16,7 +16,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -64,6 +64,7 @@
+@@ -65,6 +65,7 @@
  #define DEFAULT_RX_CSUM_ENABLE                (true)
  #define DEFAULT_TSO_CSUM_ENABLE               (true)
  #define DEFAULT_VLAN_FILTER_ENABLE    (true)
@@ -24,7 +24,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  #define TX_OVERHEAD                   (8)
  #define RXW_PADDING                   2
  
-@@ -2280,6 +2281,11 @@ static int lan78xx_set_features(struct n
+@@ -2281,6 +2282,11 @@ static int lan78xx_set_features(struct n
                pdata->rfe_ctl &= ~(RFE_CTL_ICMP_COE_ | RFE_CTL_IGMP_COE_);
        }
  
@@ -36,7 +36,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
        if (features & NETIF_F_HW_VLAN_CTAG_FILTER)
                pdata->rfe_ctl |= RFE_CTL_VLAN_FILTER_;
        else
-@@ -2895,6 +2901,9 @@ static int lan78xx_bind(struct lan78xx_n
+@@ -2896,6 +2902,9 @@ static int lan78xx_bind(struct lan78xx_n
        if (DEFAULT_TSO_CSUM_ENABLE)
                dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG;
  
@@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
        if (DEFAULT_VLAN_FILTER_ENABLE)
                dev->net->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
  
-@@ -2975,6 +2984,16 @@ static void lan78xx_rx_csum_offload(stru
+@@ -2976,6 +2985,16 @@ static void lan78xx_rx_csum_offload(stru
        }
  }
  
@@ -63,7 +63,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb)
  {
        int             status;
-@@ -3039,6 +3058,8 @@ static int lan78xx_rx(struct lan78xx_net
+@@ -3040,6 +3059,8 @@ static int lan78xx_rx(struct lan78xx_net
                        if (skb->len == size) {
                                lan78xx_rx_csum_offload(dev, skb,
                                                        rx_cmd_a, rx_cmd_b);
@@ -72,7 +72,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  
                                skb_trim(skb, skb->len - 4); /* remove fcs */
                                skb->truesize = size + sizeof(struct sk_buff);
-@@ -3057,6 +3078,7 @@ static int lan78xx_rx(struct lan78xx_net
+@@ -3058,6 +3079,7 @@ static int lan78xx_rx(struct lan78xx_net
                        skb_set_tail_pointer(skb2, size);
  
                        lan78xx_rx_csum_offload(dev, skb2, rx_cmd_a, rx_cmd_b);