diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-10-30 19:46:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-30 19:46:33 -0400 |
| commit | 9cc233fb0f94b79d07cf141a625e237769d267a1 (patch) | |
| tree | 60831d007522c8f947ff884a7831da136faa8094 /drivers/net/ethernet/mellanox/mlx4/mcg.c | |
| parent | ipv4: Do not cache routing failures due to disabled forwarding. (diff) | |
| parent | ixgbe: fix race when setting advertised speed (diff) | |
| download | linux-dev-9cc233fb0f94b79d07cf141a625e237769d267a1.tar.xz linux-dev-9cc233fb0f94b79d07cf141a625e237769d267a1.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Jeff Kirsher says:
====================
Intel Wired LAN Driver Updates 2014-10-30
This series contains updates to e1000, igb and ixgbe.
Francesco Ruggeri fixes an issue with e1000 where in a VM the driver did
not support unicast filtering.
Roman Gushchin fixes an issue with igb where the driver was re-using
mapped pages so that packets were still getting dropped even if all
the memory issues are gone and there is free memory.
Junwei Zhang found where in the ixgbe_clean_rx_ring() we were repeating
the assignment of NULL to the receive buffer skb and fixes it.
Emil fixes a race condition between setup_link and SFP detection routine
in the watchdog when setting the advertised speed.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions