diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-01-08 17:19:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-08 17:19:48 -0500 |
| commit | 63c64de7be1f762b8c6c224f2994cf5769b542ae (patch) | |
| tree | 859db16802159a764b481df06d5b863d633d48eb /net/ipv4/ip_tunnel_core.c | |
| parent | net: ipv4: Remove flow arg from ip_mkroute_input (diff) | |
| parent | fm10k: remove FM10K_FLAG_DEBUG_STATS (diff) | |
| download | linux-dev-63c64de7be1f762b8c6c224f2994cf5769b542ae.tar.xz linux-dev-63c64de7be1f762b8c6c224f2994cf5769b542ae.zip | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
100GbE Intel Wired LAN Driver Updates 2017-01-08
This series contains updates to fm10k only.
Ngai-Mint changes the driver to use the MAC pointer in the fm10k_mac_info
structure for fm10k_get_host_state_generic(). Fixed a race condition
where the mailbox interrupt request bits can be cleared before being
handled causing certain mailbox messages from the PF to be untreated
and the PF will enter in some inactive state.
Jake removes the typecast of u8 to char, and the extra variable that was
created for the typecast. Bumps the driver version. Added back the
receive descriptor timestamp value so that applications built on top
of the IES API can function properly. Cleaned up the debug statistics
flag, since debug statistics were removed and the flag was missed in
the removal.
Scott limits the DMA sync for CPU to the actual length of the packet,
instead of the entire buffer, since the DMA sync occurs every time a
packet is received.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
0 files changed, 0 insertions, 0 deletions