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

Commit 67e0c1b0 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:
 "Some holiday bug fixes for 3.13...  There is still one bug I'd like to
  get fixed before 3.13-final.

  The vlan code erroneously assignes the header ops of the underlying
  real device to the VLAN device above it when the real device can
  hardware offload VLAN handling.  That's completely bogus because
  header ops are tied to the device type, so they only expect to see a
  'dev' argument compatible with their ops.

  The fix is the have the VLAN code use a special set of header ops that
  does the pass-thru correctly, by calling the underlying real device's
  header ops but _also_ passing in the real device instead of the VLAN
  device.

  That fix is currently waiting some testing.

  Anyways, of note here:

   1) Fix bitmap edge case in radiotap, from Johannes Berg.

   2) Fix oops on driver unload in rtlwifi, from Larry Finger.

   3) Bonding doesn't do locking correctly during speed/duplex/link
      changes, from Ding Tianhong.

   4) Fix header parsing in GRE code, this bug has been around for a few
      releases.  From Timo Teräs.

   5) SIT tunnel driver MTU check needs to take GSO into account, from
      Eric Dumazet.

   6) Minor info leak in inet_diag, from Daniel Borkmann.

   7) Info leak in YAM hamradio driver, from Salva Peiró.

   8) Fix route expiration state handling in ipv6 routing code, from Li
      RongQing.

   9) DCCP probe module does not check request_module()'s return value,
      from Wang Weidong.

  10) cpsw driver passes NULL device names to request_irq(), from
      Mugunthan V N.

  11) Prevent a NULL splat in RDS binding code, from Sasha Levin.

  12) Fix 4G overflow test in tg3 driver, from Nithin Sujir.

  13) Cure use after free in arc_emac and fec driver's software
      timestamp handling, from Eric Dumazet.

  14) SIT driver can fail to release the route when
      iptunnel_handle_offloads() throws an error.  From Li RongQing.

  15) Several batman-adv fixes from Simon Wunderlich and Antonio
      Quartulli.

  16) Fix deadlock during TIPC socket release, from Ying Xue.

  17) Fix regression in ROSE protocol recvmsg() msg_name handling, from
      Florian Westphal.

  18) stmmac PTP support releases wrong spinlock, from Vince Bridgers"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (73 commits)
  stmmac: Fix incorrect spinlock release and PTP cap detection.
  phy: IRQ cannot be shared
  net: rose: restore old recvmsg behavior
  xen-netback: fix guest-receive-side array sizes
  fec: Do not assume that PHY reset is active low
  tipc: fix deadlock during socket release
  netfilter: nf_tables: fix wrong datatype in nft_validate_data_load()
  batman-adv: fix vlan header access
  batman-adv: clean nf state when removing protocol header
  batman-adv: fix alignment for batadv_tvlv_tt_change
  batman-adv: fix size of batadv_bla_claim_dst
  batman-adv: fix size of batadv_icmp_header
  batman-adv: fix header alignment by unrolling batadv_header
  batman-adv: fix alignment for batadv_coded_packet
  netfilter: nf_tables: fix oops when updating table with user chains
  netfilter: nf_tables: fix dumping with large number of sets
  ipv6: release dst properly in ipip6_tunnel_xmit
  netxen: Correct off-by-one errors in bounds checks
  net: Add some clarification to skb_tx_timestamp() comment.
  arc_emac: fix potential use after free
  ...
parents 802eee95 7cd01399

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE005) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x0489, 0xe04e) },
@@ -129,6 +130,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

drivers/infiniband/hw/cxgb4/cm.c

+20 −58
Original line number Diff line number Diff line
@@ -524,50 +524,6 @@ static int send_abort(struct c4iw_ep *ep, struct sk_buff *skb, gfp_t gfp) 
	return c4iw_l2t_send(&ep->com.dev->rdev, skb, ep->l2t);

}



#define VLAN_NONE 0xfff

#define FILTER_SEL_VLAN_NONE 0xffff

#define FILTER_SEL_WIDTH_P_FC (3+1) /* port uses 3 bits, FCoE one bit */

#define FILTER_SEL_WIDTH_VIN_P_FC \

	(6 + 7 + FILTER_SEL_WIDTH_P_FC) /* 6 bits are unused, VF uses 7 bits*/

#define FILTER_SEL_WIDTH_TAG_P_FC \

	(3 + FILTER_SEL_WIDTH_VIN_P_FC) /* PF uses 3 bits */

#define FILTER_SEL_WIDTH_VLD_TAG_P_FC (1 + FILTER_SEL_WIDTH_TAG_P_FC)



static unsigned int select_ntuple(struct c4iw_dev *dev, struct dst_entry *dst,

				  struct l2t_entry *l2t)

{

	unsigned int ntuple = 0;

	u32 viid;



	switch (dev->rdev.lldi.filt_mode) {



	/* default filter mode */

	case HW_TPL_FR_MT_PR_IV_P_FC:

		if (l2t->vlan == VLAN_NONE)

			ntuple |= FILTER_SEL_VLAN_NONE << FILTER_SEL_WIDTH_P_FC;

		else {

			ntuple |= l2t->vlan << FILTER_SEL_WIDTH_P_FC;

			ntuple |= 1 << FILTER_SEL_WIDTH_TAG_P_FC;

		}

		ntuple |= l2t->lport << S_PORT | IPPROTO_TCP <<

			  FILTER_SEL_WIDTH_VLD_TAG_P_FC;

		break;

	case HW_TPL_FR_MT_PR_OV_P_FC: {

		viid = cxgb4_port_viid(l2t->neigh->dev);



		ntuple |= FW_VIID_VIN_GET(viid) << FILTER_SEL_WIDTH_P_FC;

		ntuple |= FW_VIID_PFN_GET(viid) << FILTER_SEL_WIDTH_VIN_P_FC;

		ntuple |= FW_VIID_VIVLD_GET(viid) << FILTER_SEL_WIDTH_TAG_P_FC;

		ntuple |= l2t->lport << S_PORT | IPPROTO_TCP <<

			  FILTER_SEL_WIDTH_VLD_TAG_P_FC;

		break;

	}

	default:

		break;

	}

	return ntuple;

}



static int send_connect(struct c4iw_ep *ep)

{

	struct cpl_act_open_req *req;
@@ -641,8 +597,9 @@ static int send_connect(struct c4iw_ep *ep) 
			req->local_ip = la->sin_addr.s_addr;

			req->peer_ip = ra->sin_addr.s_addr;

			req->opt0 = cpu_to_be64(opt0);

			req->params = cpu_to_be32(select_ntuple(ep->com.dev,

						ep->dst, ep->l2t));

			req->params = cpu_to_be32(cxgb4_select_ntuple(

						ep->com.dev->rdev.lldi.ports[0],

						ep->l2t));

			req->opt2 = cpu_to_be32(opt2);

		} else {

			req6 = (struct cpl_act_open_req6 *)skb_put(skb, wrlen);
@@ -662,8 +619,8 @@ static int send_connect(struct c4iw_ep *ep) 
			req6->peer_ip_lo = *((__be64 *)

						(ra6->sin6_addr.s6_addr + 8));

			req6->opt0 = cpu_to_be64(opt0);

			req6->params = cpu_to_be32(

					select_ntuple(ep->com.dev, ep->dst,

			req6->params = cpu_to_be32(cxgb4_select_ntuple(

						ep->com.dev->rdev.lldi.ports[0],

						ep->l2t));

			req6->opt2 = cpu_to_be32(opt2);

		}
@@ -681,8 +638,9 @@ static int send_connect(struct c4iw_ep *ep) 
			t5_req->peer_ip = ra->sin_addr.s_addr;

			t5_req->opt0 = cpu_to_be64(opt0);

			t5_req->params = cpu_to_be64(V_FILTER_TUPLE(

						select_ntuple(ep->com.dev,

						ep->dst, ep->l2t)));

						     cxgb4_select_ntuple(

					     ep->com.dev->rdev.lldi.ports[0],

					     ep->l2t)));

			t5_req->opt2 = cpu_to_be32(opt2);

		} else {

			t5_req6 = (struct cpl_t5_act_open_req6 *)
@@ -703,7 +661,9 @@ static int send_connect(struct c4iw_ep *ep) 
						(ra6->sin6_addr.s6_addr + 8));

			t5_req6->opt0 = cpu_to_be64(opt0);

			t5_req6->params = (__force __be64)cpu_to_be32(

				select_ntuple(ep->com.dev, ep->dst, ep->l2t));

							cxgb4_select_ntuple(

						ep->com.dev->rdev.lldi.ports[0],

						ep->l2t));

			t5_req6->opt2 = cpu_to_be32(opt2);

		}

	}
@@ -1630,7 +1590,8 @@ static void send_fw_act_open_req(struct c4iw_ep *ep, unsigned int atid) 
	memset(req, 0, sizeof(*req));

	req->op_compl = htonl(V_WR_OP(FW_OFLD_CONNECTION_WR));

	req->len16_pkd = htonl(FW_WR_LEN16(DIV_ROUND_UP(sizeof(*req), 16)));

	req->le.filter = cpu_to_be32(select_ntuple(ep->com.dev, ep->dst,

	req->le.filter = cpu_to_be32(cxgb4_select_ntuple(

				     ep->com.dev->rdev.lldi.ports[0],

				     ep->l2t));

	sin = (struct sockaddr_in *)&ep->com.local_addr;

	req->le.lport = sin->sin_port;
@@ -2938,7 +2899,8 @@ int c4iw_create_listen(struct iw_cm_id *cm_id, int backlog) 
	/*

	 * Allocate a server TID.

	 */

	if (dev->rdev.lldi.enable_fw_ofld_conn)

	if (dev->rdev.lldi.enable_fw_ofld_conn &&

	    ep->com.local_addr.ss_family == AF_INET)

		ep->stid = cxgb4_alloc_sftid(dev->rdev.lldi.tids,

					     cm_id->local_addr.ss_family, ep);

	else
@@ -3323,9 +3285,7 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) 
	/*

	 * Calculate the server tid from filter hit index from cpl_rx_pkt.

	 */

	stid = (__force int) cpu_to_be32((__force u32) rss->hash_val)

					  - dev->rdev.lldi.tids->sftid_base

					  + dev->rdev.lldi.tids->nstids;

	stid = (__force int) cpu_to_be32((__force u32) rss->hash_val);



	lep = (struct c4iw_ep *)lookup_stid(dev->rdev.lldi.tids, stid);

	if (!lep) {
@@ -3397,7 +3357,9 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) 
	window = (__force u16) htons((__force u16)tcph->window);



	/* Calcuate filter portion for LE region. */

	filter = (__force unsigned int) cpu_to_be32(select_ntuple(dev, dst, e));

	filter = (__force unsigned int) cpu_to_be32(cxgb4_select_ntuple(

						    dev->rdev.lldi.ports[0],

						    e));



	/*

	 * Synthesize the cpl_pass_accept_req. We have everything except the

drivers/net/bonding/bond_3ad.c

+33 −12
Original line number Diff line number Diff line
@@ -2201,20 +2201,25 @@ void bond_3ad_adapter_speed_changed(struct slave *slave) 


	port = &(SLAVE_AD_INFO(slave).port);



	// if slave is null, the whole port is not initialized

	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		pr_warning("Warning: %s: speed changed for uninitialized port on %s\n",

			   slave->bond->dev->name, slave->dev->name);

		return;

	}



	__get_state_machine_lock(port);



	port->actor_admin_port_key &= ~AD_SPEED_KEY_BITS;

	port->actor_oper_port_key = port->actor_admin_port_key |=

		(__get_link_speed(port) << 1);

	pr_debug("Port %d changed speed\n", port->actor_port_number);

	// there is no need to reselect a new aggregator, just signal the

	// state machines to reinitialize

	/* there is no need to reselect a new aggregator, just signal the

	 * state machines to reinitialize

	 */

	port->sm_vars |= AD_PORT_BEGIN;



	__release_state_machine_lock(port);

}



/**
@@ -2229,20 +2234,25 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave) 


	port = &(SLAVE_AD_INFO(slave).port);



	// if slave is null, the whole port is not initialized

	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		pr_warning("%s: Warning: duplex changed for uninitialized port on %s\n",

			   slave->bond->dev->name, slave->dev->name);

		return;

	}



	__get_state_machine_lock(port);



	port->actor_admin_port_key &= ~AD_DUPLEX_KEY_BITS;

	port->actor_oper_port_key = port->actor_admin_port_key |=

		__get_duplex(port);

	pr_debug("Port %d changed duplex\n", port->actor_port_number);

	// there is no need to reselect a new aggregator, just signal the

	// state machines to reinitialize

	/* there is no need to reselect a new aggregator, just signal the

	 * state machines to reinitialize

	 */

	port->sm_vars |= AD_PORT_BEGIN;



	__release_state_machine_lock(port);

}



/**
@@ -2258,15 +2268,21 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 


	port = &(SLAVE_AD_INFO(slave).port);



	// if slave is null, the whole port is not initialized

	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",

			   slave->bond->dev->name, slave->dev->name);

		return;

	}



	// on link down we are zeroing duplex and speed since some of the adaptors(ce1000.lan) report full duplex/speed instead of N/A(duplex) / 0(speed)

	// on link up we are forcing recheck on the duplex and speed since some of he adaptors(ce1000.lan) report

	__get_state_machine_lock(port);

	/* on link down we are zeroing duplex and speed since

	 * some of the adaptors(ce1000.lan) report full duplex/speed

	 * instead of N/A(duplex) / 0(speed).

	 *

	 * on link up we are forcing recheck on the duplex and speed since

	 * some of he adaptors(ce1000.lan) report.

	 */

	if (link == BOND_LINK_UP) {

		port->is_enabled = true;

		port->actor_admin_port_key &= ~AD_DUPLEX_KEY_BITS;
@@ -2282,10 +2298,15 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 
		port->actor_oper_port_key = (port->actor_admin_port_key &=

					     ~AD_SPEED_KEY_BITS);

	}

	//BOND_PRINT_DBG(("Port %d changed link status to %s", port->actor_port_number, ((link == BOND_LINK_UP)?"UP":"DOWN")));

	// there is no need to reselect a new aggregator, just signal the

	// state machines to reinitialize

	pr_debug("Port %d changed link status to %s",

		port->actor_port_number,

		(link == BOND_LINK_UP) ? "UP" : "DOWN");

	/* there is no need to reselect a new aggregator, just signal the

	 * state machines to reinitialize

	 */

	port->sm_vars |= AD_PORT_BEGIN;



	__release_state_machine_lock(port);

}



/*

drivers/net/ethernet/arc/emac_main.c

+2 −2
Original line number Diff line number Diff line
@@ -565,6 +565,8 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) 
	/* Make sure pointer to data buffer is set */

	wmb();



	skb_tx_timestamp(skb);



	*info = cpu_to_le32(FOR_EMAC | FIRST_OR_LAST_MASK | len);



	/* Increment index to point to the next BD */
@@ -579,8 +581,6 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) 


	arc_reg_set(priv, R_STATUS, TXPL_MASK);



	skb_tx_timestamp(skb);



	return NETDEV_TX_OK;

}