summaryrefslogtreecommitdiff
path: root/net/batman-adv
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-08 06:11:19 (GMT)
committerDavid S. Miller <davem@davemloft.net>2014-01-08 06:11:19 (GMT)
commit80077935cad223b292d4a03e901a953b20a36593 (patch)
tree1e0c38d7dbfa11449e77dc20fc6755454b8a2d38 /net/batman-adv
parentda7c224b1baaeb7543dc7663ae78716f9a6864c1 (diff)
parent9007777364e91e1e4348cdf503223a80f81065b5 (diff)
downloadlinux-80077935cad223b292d4a03e901a953b20a36593.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to i40e only. Anjali adds more functionality to debugfs to assist development and testing of admin queue commands. Greg makes sure broadcast promiscuous is disabled by default, otherwise VLAN tagged packets out of the assigned VLAN domain are received. Also provides a fix when the 8021q driver is loaded, so that VLAN 0 tagged packets are accepted so that upper layers can interpret the priority bits. Then provides a fix to let the VF to request the PF to set its already assigned MAC address without generating an error. Greg also adds helper functions to enable or disable internal switch loopback when VFs are created or destroyed via the sysfs interface. Shannon provides most of the changes, where he adds code to ensure that the hardware waits to make sure that the firmware is ready as well after reset. Also updates the code to use the new features in the firmware. Provides a fix while in MFP mode where resources are reduced, so use a smaller range of test registers than when in SFP mode. Moves the PF ID initialization code to earlier in the driver initialization function since a few operations need the information before the first PF reset is called. Shannon adds a check for MAC type before reading anything from the registers to ensure we dealing with the correct MAC type. Then reworks Shadow RAM read word/buffer functions as to not block whole NVM resources for SR read operations. Mitch lastly provides a fix to correctly setup ARQ descriptors in the cleanup code. Catherine bumps the driver version due to all the recent changes. v2: - Added blank lines after local variable declarations to patch 01 as suggested by David Miller - Used the suggested memset() line in patch 15 as suggested by David Miller ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
0 files changed, 0 insertions, 0 deletions