diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-15 19:59:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-15 19:59:10 +0100 |
| commit | 101c431492d297dd0d111b461d8d324895676bee (patch) | |
| tree | 06d8a02a4fd91acdd6c31340452e85feaac4ecb7 /drivers/net/hyperv/hyperv_net.h | |
| parent | qed*: Add support for QL41xxx adapters (diff) | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| download | linux-101c431492d297dd0d111b461d8d324895676bee.tar.xz linux-101c431492d297dd0d111b461d8d324895676bee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmgenet.c
net/core/sock.c
Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/hyperv_net.h')
| -rw-r--r-- | drivers/net/hyperv/hyperv_net.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 7433b164e513..b09c4fca1805 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -701,6 +701,8 @@ struct net_device_context { u32 tx_checksum_mask; + u32 tx_send_table[VRSS_SEND_TAB_SIZE]; + /* Ethtool settings */ u8 duplex; u32 speed; @@ -759,7 +761,6 @@ struct netvsc_device { struct nvsp_message revoke_packet; - u32 send_table[VRSS_SEND_TAB_SIZE]; u32 max_chn; u32 num_chn; spinlock_t sc_lock; /* Protects num_sc_offered variable */ |