diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-02 23:43:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-02 23:43:48 -0500 |
| commit | 0fe824d3654a38677ed0318204d166f947175b02 (patch) | |
| tree | b8b9f57c0ea7508309f5cb9f8ea6bc412557c8c2 /include | |
| parent | 117ce394f2393a2ecfbeb1fbd3930c8cc831ac96 (diff) | |
| parent | 760d1e36cc16fa6444dd2000ac645455de1ecd51 (diff) | |
| download | linux-0fe824d3654a38677ed0318204d166f947175b02.tar.bz2 | |
Merge branch 'hv_netvsc-less-headroom'
Merge branch 'hv_netvsc-less-headroom'
K. Y. Srinivasan says:
====================
hv_netvsc: Eliminate the additional head room
In an attempt to avoid having to allocate memory on the send path, the netvsc
driver was requesting additional head room so that both rndis header and the
netvsc packet (the state that had to persist) could be placed in the skb.
Since the amount of head room requested was exceeding the default head room
as set in LL_MAX_HEADER, we were forcing a reallocation of skb.
With this patch-set, I have reduced the size of the netvsc packet to less
than 20 bytes and with this reduction we don't need to ask for any additional
headroom. We place the rndis header in the skb head room and we place the
netvsc packet in control buffer area in the skb.
V2: - Addressed review comments:
- Eliminated more fields from netvsc packet structure.
V3: - Fixed a typo in patch: hv_netvsc: Don't ask for additional head room in the skb.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7d2d1d7aaec7..fcbc5259c630 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -132,7 +132,9 @@ static inline bool dev_xmit_complete(int rc) * used. */ -#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) +#if defined(CONFIG_HYPERV_NET) +# define LL_MAX_HEADER 128 +#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) # if defined(CONFIG_MAC80211_MESH) # define LL_MAX_HEADER 128 # else |