Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc867651 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) All users of AF_PACKET's fanout feature want a symmetric packet
    header hash for load balancing purposes, so give it to them.

 2) Fix vlan state synchronization in e1000e, from Jarod Wilson.

 3) Use correct socket pointer in ip_skb_dst_mtu(), from Shmulik
    Ladkani.

 4) mlx5 bug fixes from Mohamad Haj Yahia, Daniel Jurgens, Matthew
    Finlay, Rana Shahout, and Shaker Daibes.  Mostly to do with
    operation timeouts and PCI error handling.

 5) Fix checksum handling in mirred packet action, from WANG Cong.

 6) Set skb->dev correctly when transmitting in !protect_frames case of
    macsec driver, from Daniel Borkmann.

 7) Fix MTU calculation in geneve driver, from Haishuang Yan.

 8) Missing netif_napi_del() in unregister path of qeth driver, from
    Ursula Braun.

 9) Handle malformed route netlink messages in decnet properly, from
    Vergard Nossum.

10) Memory leak of percpu data in ipv6 routing code, from Martin KaFai
    Lau.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
  ipv6: Fix mem leak in rt6i_pcpu
  net: fix decnet rtnexthop parsing
  cxgb4: update latest firmware version supported
  net/mlx5: Avoid setting unused var when modifying vport node GUID
  bonding: fix enslavement slave link notifications
  r8152: fix runtime function for RTL8152
  qeth: delete napi struct when removing a qeth device
  Revert "fsl/fman: fix error handling"
  fsl/fman: fix error handling
  cdc_ncm: workaround for EM7455 "silent" data interface
  RDS: fix rds_tcp_init() error path
  geneve: fix max_mtu setting
  net: phy: dp83867: Fix initialization of PHYCR register
  enc28j60: Fix race condition in enc28j60 driver
  net: stmmac: Fix null-function call in ISR on stmmac1000
  tipc: fix nl compat regression for link statistics
  net: bcmsysport: Device stats are unsigned long
  macsec: set actual real device for xmit when !protect_frames
  net_sched: fix mirrored packets checksum
  packet: Use symmetric hash for PACKET_FANOUT_HASH.
  ...
parents 4cdbbbd1 903ce4ab

drivers/net/bonding/bond_3ad.c

+7 −4
Original line number Diff line number Diff line
@@ -101,11 +101,14 @@ enum ad_link_speed_type { 
#define MAC_ADDRESS_EQUAL(A, B)	\

	ether_addr_equal_64bits((const u8 *)A, (const u8 *)B)



static struct mac_addr null_mac_addr = { { 0, 0, 0, 0, 0, 0 } };

static const u8 null_mac_addr[ETH_ALEN + 2] __long_aligned = {

	0, 0, 0, 0, 0, 0

};

static u16 ad_ticks_per_sec;

static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;



static const u8 lacpdu_mcast_addr[ETH_ALEN] = MULTICAST_LACPDU_ADDR;

static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned =

	MULTICAST_LACPDU_ADDR;



/* ================= main 802.3ad protocol functions ================== */

static int ad_lacpdu_send(struct port *port);
@@ -1739,7 +1742,7 @@ static void ad_clear_agg(struct aggregator *aggregator) 
		aggregator->is_individual = false;

		aggregator->actor_admin_aggregator_key = 0;

		aggregator->actor_oper_aggregator_key = 0;

		aggregator->partner_system = null_mac_addr;

		eth_zero_addr(aggregator->partner_system.mac_addr_value);

		aggregator->partner_system_priority = 0;

		aggregator->partner_oper_aggregator_key = 0;

		aggregator->receive_state = 0;
@@ -1761,7 +1764,7 @@ static void ad_initialize_agg(struct aggregator *aggregator) 
	if (aggregator) {

		ad_clear_agg(aggregator);



		aggregator->aggregator_mac_address = null_mac_addr;

		eth_zero_addr(aggregator->aggregator_mac_address.mac_addr_value);

		aggregator->aggregator_identifier = 0;

		aggregator->slave = NULL;

	}

drivers/net/bonding/bond_alb.c

+2 −5
Original line number Diff line number Diff line
@@ -42,13 +42,10 @@ 






#ifndef __long_aligned

#define __long_aligned __attribute__((aligned((sizeof(long)))))

#endif

static const u8 mac_bcast[ETH_ALEN] __long_aligned = {

static const u8 mac_bcast[ETH_ALEN + 2] __long_aligned = {

	0xff, 0xff, 0xff, 0xff, 0xff, 0xff

};

static const u8 mac_v6_allmcast[ETH_ALEN] __long_aligned = {

static const u8 mac_v6_allmcast[ETH_ALEN + 2] __long_aligned = {

	0x33, 0x33, 0x00, 0x00, 0x00, 0x01

};

static const int alb_delta_in_ticks = HZ / ALB_TIMER_TICKS_PER_SEC;

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1584,6 +1584,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	}



	/* check for initial state */

	new_slave->link = BOND_LINK_NOCHANGE;

	if (bond->params.miimon) {

		if (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS) {

			if (bond->params.updelay) {

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void bcm_sysport_get_stats(struct net_device *dev, 
		else

			p = (char *)priv;

		p += s->stat_offset;

		data[i] = *(u32 *)p;

		data[i] = *(unsigned long *)p;

	}

}

drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h

+6 −6
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#define __T4FW_VERSION_H__



#define T4FW_VERSION_MAJOR 0x01

#define T4FW_VERSION_MINOR 0x0E

#define T4FW_VERSION_MICRO 0x04

#define T4FW_VERSION_MINOR 0x0F

#define T4FW_VERSION_MICRO 0x25

#define T4FW_VERSION_BUILD 0x00



#define T4FW_MIN_VERSION_MAJOR 0x01
@@ -45,8 +45,8 @@ 
#define T4FW_MIN_VERSION_MICRO 0x00



#define T5FW_VERSION_MAJOR 0x01

#define T5FW_VERSION_MINOR 0x0E

#define T5FW_VERSION_MICRO 0x04

#define T5FW_VERSION_MINOR 0x0F

#define T5FW_VERSION_MICRO 0x25

#define T5FW_VERSION_BUILD 0x00



#define T5FW_MIN_VERSION_MAJOR 0x00
@@ -54,8 +54,8 @@ 
#define T5FW_MIN_VERSION_MICRO 0x00



#define T6FW_VERSION_MAJOR 0x01

#define T6FW_VERSION_MINOR 0x0E

#define T6FW_VERSION_MICRO 0x04

#define T6FW_VERSION_MINOR 0x0F

#define T6FW_VERSION_MICRO 0x25

#define T6FW_VERSION_BUILD 0x00



#define T6FW_MIN_VERSION_MAJOR 0x00