diff options
author | Patrick McHardy <kaber@trash.net> | 2013-04-20 20:09:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-21 15:58:19 -0400 |
commit | 91b1c1aab2f70c30fa3efc0d42d63b2e25a6bd68 (patch) | |
tree | 9bbcc22b82a255cc02ed1cf9fd1d8d420325c841 /drivers/s390 | |
parent | 8da63a655d5b8ec16512ae6bfeee40c50f11404f (diff) |
qeth: fix VLAN related compilation errors
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_add_vlan_mc':
>> drivers/s390/net/qeth_l3_main.c:1662:3: error: too few arguments to function '__vlan_find_dev_deep'
include/linux/if_vlan.h:88:27: note: declared here
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_add_vlan_mc6':
>> drivers/s390/net/qeth_l3_main.c:1723:3: error: too few arguments to function '__vlan_find_dev_deep'
include/linux/if_vlan.h:88:27: note: declared here
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_free_vlan_addresses4':
>> drivers/s390/net/qeth_l3_main.c:1767:2: error: too few arguments to function '__vlan_find_dev_deep'
include/linux/if_vlan.h:88:27: note: declared here
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_free_vlan_addresses6':
>> drivers/s390/net/qeth_l3_main.c:1797:2: error: too few arguments to function '__vlan_find_dev_deep'
include/linux/if_vlan.h:88:27: note: declared here
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_process_inbound_buffer':
>> drivers/s390/net/qeth_l3_main.c:1980:6: error: too few arguments to function '__vlan_hwaccel_put_tag'
include/linux/if_vlan.h:234:31: note: declared here
drivers/s390/net/qeth_l3_main.c: In function 'qeth_l3_verify_vlan_dev':
>> drivers/s390/net/qeth_l3_main.c:2089:3: error: too few arguments to function '__vlan_find_dev_deep'
include/linux/if_vlan.h:88:27: note: declared here
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 642686846a14..c915e5cd7f47 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c | |||
@@ -1659,7 +1659,8 @@ static void qeth_l3_add_vlan_mc(struct qeth_card *card) | |||
1659 | for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) { | 1659 | for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) { |
1660 | struct net_device *netdev; | 1660 | struct net_device *netdev; |
1661 | 1661 | ||
1662 | netdev = __vlan_find_dev_deep(card->dev, vid); | 1662 | netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), |
1663 | vid); | ||
1663 | if (netdev == NULL || | 1664 | if (netdev == NULL || |
1664 | !(netdev->flags & IFF_UP)) | 1665 | !(netdev->flags & IFF_UP)) |
1665 | continue; | 1666 | continue; |
@@ -1720,7 +1721,8 @@ static void qeth_l3_add_vlan_mc6(struct qeth_card *card) | |||
1720 | for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) { | 1721 | for_each_set_bit(vid, card->active_vlans, VLAN_N_VID) { |
1721 | struct net_device *netdev; | 1722 | struct net_device *netdev; |
1722 | 1723 | ||
1723 | netdev = __vlan_find_dev_deep(card->dev, vid); | 1724 | netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), |
1725 | vid); | ||
1724 | if (netdev == NULL || | 1726 | if (netdev == NULL || |
1725 | !(netdev->flags & IFF_UP)) | 1727 | !(netdev->flags & IFF_UP)) |
1726 | continue; | 1728 | continue; |
@@ -1764,7 +1766,7 @@ static void qeth_l3_free_vlan_addresses4(struct qeth_card *card, | |||
1764 | 1766 | ||
1765 | QETH_CARD_TEXT(card, 4, "frvaddr4"); | 1767 | QETH_CARD_TEXT(card, 4, "frvaddr4"); |
1766 | 1768 | ||
1767 | netdev = __vlan_find_dev_deep(card->dev, vid); | 1769 | netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), vid); |
1768 | if (!netdev) | 1770 | if (!netdev) |
1769 | return; | 1771 | return; |
1770 | in_dev = in_dev_get(netdev); | 1772 | in_dev = in_dev_get(netdev); |
@@ -1794,7 +1796,7 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card, | |||
1794 | 1796 | ||
1795 | QETH_CARD_TEXT(card, 4, "frvaddr6"); | 1797 | QETH_CARD_TEXT(card, 4, "frvaddr6"); |
1796 | 1798 | ||
1797 | netdev = __vlan_find_dev_deep(card->dev, vid); | 1799 | netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), vid); |
1798 | if (!netdev) | 1800 | if (!netdev) |
1799 | return; | 1801 | return; |
1800 | in6_dev = in6_dev_get(netdev); | 1802 | in6_dev = in6_dev_get(netdev); |
@@ -1977,7 +1979,8 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card, | |||
1977 | &vlan_tag); | 1979 | &vlan_tag); |
1978 | len = skb->len; | 1980 | len = skb->len; |
1979 | if (is_vlan && !card->options.sniffer) | 1981 | if (is_vlan && !card->options.sniffer) |
1980 | __vlan_hwaccel_put_tag(skb, vlan_tag); | 1982 | __vlan_hwaccel_put_tag(skb, |
1983 | htons(ETH_P_8021Q), vlan_tag); | ||
1981 | napi_gro_receive(&card->napi, skb); | 1984 | napi_gro_receive(&card->napi, skb); |
1982 | } | 1985 | } |
1983 | break; | 1986 | break; |
@@ -2086,7 +2089,8 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev, | |||
2086 | struct net_device *netdev; | 2089 | struct net_device *netdev; |
2087 | 2090 | ||
2088 | rcu_read_lock(); | 2091 | rcu_read_lock(); |
2089 | netdev = __vlan_find_dev_deep(card->dev, vid); | 2092 | netdev = __vlan_find_dev_deep(card->dev, htons(ETH_P_8021Q), |
2093 | vid); | ||
2090 | rcu_read_unlock(); | 2094 | rcu_read_unlock(); |
2091 | if (netdev == dev) { | 2095 | if (netdev == dev) { |
2092 | rc = QETH_VLAN_CARD; | 2096 | rc = QETH_VLAN_CARD; |