diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-08 14:08:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-08 14:08:35 -0500 |
| commit | bf745e88b733a2806dc4da8a9cd5a7e4d67543ab (patch) | |
| tree | b78bd559f9088337a8654aeefefc6bad997a679c /include | |
| parent | a7ac8fc1d8d26c975c460a69aa7b9d5b5d5d29b0 (diff) | |
| parent | 2b642ca5e93fa1c977e8c90480a2900149f262be (diff) | |
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 { | |||
| 871 | unsigned int sgc); | 871 | unsigned int sgc); |
| 872 | int (*ndo_fcoe_ddp_done)(struct net_device *dev, | 872 | int (*ndo_fcoe_ddp_done)(struct net_device *dev, |
| 873 | u16 xid); | 873 | u16 xid); |
| 874 | int (*ndo_fcoe_ddp_target)(struct net_device *dev, | ||
| 875 | u16 xid, | ||
| 876 | struct scatterlist *sgl, | ||
| 877 | unsigned int sgc); | ||
| 874 | #define NETDEV_FCOE_WWNN 0 | 878 | #define NETDEV_FCOE_WWNN 0 |
| 875 | #define NETDEV_FCOE_WWPN 1 | 879 | #define NETDEV_FCOE_WWPN 1 |
| 876 | int (*ndo_fcoe_get_wwn)(struct net_device *dev, | 880 | int (*ndo_fcoe_get_wwn)(struct net_device *dev, |