target/linux/generic/patches-4.1/731-phy_mvswitch_3.10_compilation.patch

   1 From e6a5abb9a02be0bceb4782d9f736bfb4ae217505 Mon Sep 17 00:00:00 2001
   2 From: Jonas Gorski <jogo@openwrt.org>
   3 Date: Sat, 21 Sep 2013 13:56:51 +0200
   4 Subject: [PATCH] phy: mvswitch: fix 3.10 compilation
   5
   6 Update to API changes in 3.10.
   7
   8 Signed-off-by: Jonas Gorsi <jogo@openwrt.org>
   9 ---
  10  target/linux/generic/files/drivers/net/phy/mvswitch.c | 6 +++---
  11  1 file changed, 3 insertions(+), 3 deletions(-)
  12
  13 --- a/drivers/net/phy/mvswitch.c
  14 +++ b/drivers/net/phy/mvswitch.c
  15 @@ -173,7 +173,7 @@ mvswitch_mangle_rx(struct net_device *de
  16         if (vlan == -1)
  17                 return;
  18
  19 -       __vlan_hwaccel_put_tag(skb, vlan);
  20 +       __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);
  21  }
  22
  23
  24 @@ -307,9 +307,9 @@ mvswitch_config_init(struct phy_device *
  25
  26  #ifdef HEADER_MODE
  27         dev->priv_flags |= IFF_NO_IP_ALIGN;
  28 -       dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
  29 +       dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX;
  30  #else
  31 -       dev->features |= NETIF_F_HW_VLAN_RX;
  32 +       dev->features |= NETIF_F_HW_VLAN_CTAG_RX;
  33  #endif
  34
  35         return 0;