diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 08:04:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-21 14:20:16 -0500 |
commit | b960a0ac6939ef4962c5abbf33e80d1382b45fc1 (patch) | |
tree | 8ec2827b9838d2f5377b3fb962e844d9f097bb9a /drivers/scsi/fcoe | |
parent | 1abcd82c20e7cbfd2b89d834b24ff68feae158ec (diff) |
vlan: make __vlan_hwaccel_put_tag return void
Always returns the same skb it gets, so change to void.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 4a8ac7d8c76b..73a8cc485f87 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -1669,10 +1669,8 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp) | |||
1669 | fcoe->realdev->features & NETIF_F_HW_VLAN_CTAG_TX) { | 1669 | fcoe->realdev->features & NETIF_F_HW_VLAN_CTAG_TX) { |
1670 | /* must set skb->dev before calling vlan_put_tag */ | 1670 | /* must set skb->dev before calling vlan_put_tag */ |
1671 | skb->dev = fcoe->realdev; | 1671 | skb->dev = fcoe->realdev; |
1672 | skb = __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), | 1672 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), |
1673 | vlan_dev_vlan_id(fcoe->netdev)); | 1673 | vlan_dev_vlan_id(fcoe->netdev)); |
1674 | if (!skb) | ||
1675 | return -ENOMEM; | ||
1676 | } else | 1674 | } else |
1677 | skb->dev = fcoe->netdev; | 1675 | skb->dev = fcoe->netdev; |
1678 | 1676 | ||