diff options
author | David S. Miller <davem@davemloft.net> | 2013-02-15 15:32:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-15 15:32:23 -0500 |
commit | f85b02c2bd7be7832f4d1ff55f401fcf38573e47 (patch) | |
tree | f151bdc311d6441d24a886d5fecc71da5bc3635d /drivers/net/ieee802154 | |
parent | 68c331631143f5f039baac99a650e0b9e1ea02b6 (diff) | |
parent | 8fc3bb6daab26e0c40c19040208091f140b6f8d5 (diff) | |
download | blackbird-obmc-linux-f85b02c2bd7be7832f4d1ff55f401fcf38573e47.tar.gz blackbird-obmc-linux-f85b02c2bd7be7832f4d1ff55f401fcf38573e47.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to igb and ixgbe. Most of the changes
are against igb, except for one patch against ixgbe.
There are 3 igb fixes from Carolyn which were reported by Dan
Carpenter which resolve issues found in the get_i2c_client(). Alex
does some cleanup of the igb driver to match similar functionality
in ixgbe on transmit. Alex also makes it so that we can enable the use
of build_skb for cases where jumbo frames are disabled. The advantage
to this is that we do not have to perform a memcpy to populate the header
and as a result we see a significant performance improvement.
Akeem provides 4 patches to initialize function pointers and do a
re-factoring of the function pointers in igb_get_variants() to assist
with driver debugging.
The ixgbe patch comes from Emil to reshuffle the switch/case structure
of the flag assignment to allow for the flags to be set for each MAC
type separately. This is needed for new hardware that does not have feature
parity with older hardware.
v2: updated patches 4 & 5 based on feedback from Ben Hutchings and Eric
Dumazet
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ieee802154')
0 files changed, 0 insertions, 0 deletions