From: David S. Miller Date: Wed, 23 Apr 2014 21:04:37 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=573be693ce72753c71cb957c2d38fd9cc6d9f568;p=deliverable%2Flinux.git Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to ixgbe, ixgbevf, e1000e, igb and i40e. Jacob converts the ixgbe low_water into an array which allows the algorithm to output different values for different TCs and we can distinguish between them. Removes vlan_filter_disable() and vlan_filter_enable() in ixgbe so that we can do the work directly in set_rx_mode(). Changes the setting of multicast filters only when the interface is not in promiscuous mode for multicast packets in ixgbe. Improves MAC filter handling by adding mac_table API based on work done for igb, which includes functions to add/delete MAC filters. Mark changes register reads in ixgbe to an out-of-line function since register reads are slow. Emil provides a ixgbevf patch to update the driver description since it supports more than just 82599 parts now. David provides several cleanup patches for e1000e which resolve some checkpatch issues as well as changing occurrences of returning 0 or 1 in bool functions to returning true false or true. Carolyn provides several cleanup patches for igb which fix checkpatch warnings. Mitch provides a fix for i40evf where the driver would correctly allow the virtual function link state to be controlled by 'ip set link', but would not report it correctly back. This is fixed by filling out the appropriate field in the VF info struct. ==================== Signed-off-by: David S. Miller --- 573be693ce72753c71cb957c2d38fd9cc6d9f568