diff options
| author | David S. Miller <davem@davemloft.net> | 2017-07-24 17:39:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-24 17:39:29 -0700 |
| commit | 01c49884ddff7a6efd56e7b44ba0d6da22fb2ba4 (patch) | |
| tree | 24810e45ca5dc8932dbdc7133cd1a34b2a56f961 /drivers/net/hyperv/hyperv_net.h | |
| parent | bae75b66a813c8ae71396c766dd08cbf8dcca943 (diff) | |
| parent | 658677f17c5cbe84ec24fd7be69b4da1ed580596 (diff) | |
Merge branch 'netvsc-minor-fixes'
Stephen Hemminger says:
====================
netvsc: minor fixes
This fixes fallout from previous patch related to RTNL and RCU
annotaiton. Also one patch sent to wrong list.
====================
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index afb65f753574..4e7ff348327e 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -147,7 +147,6 @@ struct hv_netvsc_packet { struct netvsc_device_info { unsigned char mac_adr[ETH_ALEN]; int ring_size; - u32 max_num_vrss_chns; u32 num_chn; }; |