diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-03-08 11:08:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-08 11:08:35 -0800 |
| commit | bf745e88b733a2806dc4da8a9cd5a7e4d67543ab (patch) | |
| tree | b78bd559f9088337a8654aeefefc6bad997a679c /include | |
| parent | ipv4: Fix scope value used in route src-address caching. (diff) | |
| parent | ixgbe: fix setting and reporting of advertised speeds (diff) | |
| download | linux-dev-bf745e88b733a2806dc4da8a9cd5a7e4d67543ab.tar.xz linux-dev-bf745e88b733a2806dc4da8a9cd5a7e4d67543ab.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 71563e7b2bfb..6bd5d460b7c1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -871,6 +871,10 @@ struct net_device_ops { unsigned int sgc); int (*ndo_fcoe_ddp_done)(struct net_device *dev, u16 xid); + int (*ndo_fcoe_ddp_target)(struct net_device *dev, + u16 xid, + struct scatterlist *sgl, + unsigned int sgc); #define NETDEV_FCOE_WWNN 0 #define NETDEV_FCOE_WWPN 1 int (*ndo_fcoe_get_wwn)(struct net_device *dev, |