diff options
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r-- | net/8021q/vlan_dev.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index be737539f34d..e34ea9e5e28b 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -625,6 +625,19 @@ static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type) | |||
625 | rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type); | 625 | rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type); |
626 | return rc; | 626 | return rc; |
627 | } | 627 | } |
628 | |||
629 | static int vlan_dev_fcoe_ddp_target(struct net_device *dev, u16 xid, | ||
630 | struct scatterlist *sgl, unsigned int sgc) | ||
631 | { | ||
632 | struct net_device *real_dev = vlan_dev_info(dev)->real_dev; | ||
633 | const struct net_device_ops *ops = real_dev->netdev_ops; | ||
634 | int rc = 0; | ||
635 | |||
636 | if (ops->ndo_fcoe_ddp_target) | ||
637 | rc = ops->ndo_fcoe_ddp_target(real_dev, xid, sgl, sgc); | ||
638 | |||
639 | return rc; | ||
640 | } | ||
628 | #endif | 641 | #endif |
629 | 642 | ||
630 | static void vlan_dev_change_rx_flags(struct net_device *dev, int change) | 643 | static void vlan_dev_change_rx_flags(struct net_device *dev, int change) |
@@ -707,6 +720,7 @@ static int vlan_dev_init(struct net_device *dev) | |||
707 | dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid; | 720 | dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid; |
708 | #endif | 721 | #endif |
709 | 722 | ||
723 | dev->needed_headroom = real_dev->needed_headroom; | ||
710 | if (real_dev->features & NETIF_F_HW_VLAN_TX) { | 724 | if (real_dev->features & NETIF_F_HW_VLAN_TX) { |
711 | dev->header_ops = real_dev->header_ops; | 725 | dev->header_ops = real_dev->header_ops; |
712 | dev->hard_header_len = real_dev->hard_header_len; | 726 | dev->hard_header_len = real_dev->hard_header_len; |
@@ -858,6 +872,7 @@ static const struct net_device_ops vlan_netdev_ops = { | |||
858 | .ndo_fcoe_enable = vlan_dev_fcoe_enable, | 872 | .ndo_fcoe_enable = vlan_dev_fcoe_enable, |
859 | .ndo_fcoe_disable = vlan_dev_fcoe_disable, | 873 | .ndo_fcoe_disable = vlan_dev_fcoe_disable, |
860 | .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn, | 874 | .ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn, |
875 | .ndo_fcoe_ddp_target = vlan_dev_fcoe_ddp_target, | ||
861 | #endif | 876 | #endif |
862 | }; | 877 | }; |
863 | 878 | ||