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

Commit 6843cc0e 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) Fix regression allowing IP_TTL setting of zero, fix from Cong Wang.

 2) Fix leak regressions in tunap, from Jason Wang.

 3) be2net driver always returns IRQ_HANDLED in INTx handler, fix from
    Sathya Perla.

 4) qlge doesn't really support NETIF_F_TSO6, don't set that flag.  Fix
    from Amerigo Wang.

 5) Add 802.11ad Atheros wil6210 driver, from Vladimir Kondratiev.

 6) Fix MTU calculations in mac80211 layer, from T Krishna Chaitanya.

 7) Station info layer of mac80211 needs to use del_timer_sync(), from
    Johannes Berg.

 8) tcp_read_sock() can loop forever, because we don't immediately stop
    when recv_actor() returns zero.  Fix from Eric Dumazet.

 9) Fix WARN_ON() in tcp_cleanup_rbuf().  We have to use sk_eat_skb() in
    tcp_recv_skb() to handle the case where a large GRO packet is split
    up while it is use by a splice() operation.  Fix also from Eric
    Dumazet.

10) addrconf_get_prefix_route() in ipv6 tests flags incorrectly, it
    does:

        if (X && (p->flags & Y) != 0)

    when it really meant to go:

        if (X && (p->flags & X) != 0)

    fix from Romain Kuntz.

11) Fix lost Kconfig dependency for bfin_mac driver hardware
    timestamping.  From Lars-Peter Clausen.

12) Fix regression in handling of RST without ACK in TCP, from Eric
    Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
  be2net: fix unconditionally returning IRQ_HANDLED in INTx
  tuntap: fix leaking reference count
  tuntap: forbid calling TUNSETIFF when detached
  tuntap: switch to use rtnl_dereference()
  net, wireless: overwrite default_ethtool_ops
  qlge: remove NETIF_F_TSO6 flag
  tcp: accept RST without ACK flag
  net: ethernet: xilinx: Do not use NO_IRQ in axienet
  net: ethernet: xilinx: Do not use axienet on PPC
  bnx2x: Allow management traffic after boot from SAN
  bnx2x: Fix fastpath structures when memory allocation fails
  bfin_mac: Restore hardware time-stamping dependency on BF518
  tun: avoid owner checks on IFF_ATTACH_QUEUE
  bnx2x: move debugging code before the return
  tuntap: refuse to re-attach to different tun_struct
  ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]
  ipv6: fix the noflags test in addrconf_get_prefix_route
  tcp: fix splice() and tcp collapsing interaction
  tcp: splice: fix an infinite loop in tcp_read_sock()
  net: prevent setting ttl=0 via IP_TTL
  ...
parents 7c8284c3 d0b9cec3

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k 
S:	Supported

F:	drivers/net/wireless/ath/ath9k/



WILOCITY WIL6210 WIRELESS DRIVER

M:	Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	wil6210@qca.qualcomm.com

S:	Supported

W:	http://wireless.kernel.org/en/users/Drivers/wil6210

F:	drivers/net/wireless/ath/wil6210/



CARL9170 LINUX COMMUNITY WIRELESS DRIVER

M:	Christian Lamparter <chunkeey@googlemail.com>

L:	linux-wireless@vger.kernel.org

drivers/net/ethernet/adi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ config BFIN_RX_DESC_NUM 


config BFIN_MAC_USE_HWSTAMP

	bool "Use IEEE 1588 hwstamp"

	depends on BFIN_MAC && BF518

	select PTP_1588_CLOCK

	default y

	---help---

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+28 −2
Original line number Diff line number Diff line
@@ -80,12 +80,37 @@ static inline void bnx2x_move_fp(struct bnx2x *bp, int from, int to) 
		new_txdata_index = new_max_eth_txqs + FCOE_TXQ_IDX_OFFSET;

	}



	memcpy(&bp->bnx2x_txq[old_txdata_index],

	       &bp->bnx2x_txq[new_txdata_index],

	memcpy(&bp->bnx2x_txq[new_txdata_index],

	       &bp->bnx2x_txq[old_txdata_index],

	       sizeof(struct bnx2x_fp_txdata));

	to_fp->txdata_ptr[0] = &bp->bnx2x_txq[new_txdata_index];

}



/**

 * bnx2x_shrink_eth_fp - guarantees fastpath structures stay intact

 *

 * @bp:	driver handle

 * @delta:	number of eth queues which were not allocated

 */

static void bnx2x_shrink_eth_fp(struct bnx2x *bp, int delta)

{

	int i, cos, old_eth_num = BNX2X_NUM_ETH_QUEUES(bp);



	/* Queue pointer cannot be re-set on an fp-basis, as moving pointer

	 * backward along the array could cause memory to be overriden

	 */

	for (cos = 1; cos < bp->max_cos; cos++) {

		for (i = 0; i < old_eth_num - delta; i++) {

			struct bnx2x_fastpath *fp = &bp->fp[i];

			int new_idx = cos * (old_eth_num - delta) + i;



			memcpy(&bp->bnx2x_txq[new_idx], fp->txdata_ptr[cos],

			       sizeof(struct bnx2x_fp_txdata));

			fp->txdata_ptr[cos] = &bp->bnx2x_txq[new_idx];

		}

	}

}



int load_count[2][3] = { {0} }; /* per-path: 0-common, 1-port0, 2-port1 */



/* free skb in the packet ring at pos idx
@@ -3863,6 +3888,7 @@ int bnx2x_alloc_fp_mem(struct bnx2x *bp) 
		int delta = BNX2X_NUM_ETH_QUEUES(bp) - i;



		WARN_ON(delta < 0);

		bnx2x_shrink_eth_fp(bp, delta);

		if (CNIC_SUPPORT(bp))

			/* move non eth FPs next to last eth FP

			 * must be done in that order

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -2777,10 +2777,10 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info) 
		} else if ((info->flow_type == UDP_V6_FLOW) &&

			   (bp->rss_conf_obj.udp_rss_v6 != udp_rss_requested)) {

			bp->rss_conf_obj.udp_rss_v6 = udp_rss_requested;

			return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, 0);

			DP(BNX2X_MSG_ETHTOOL,

			   "rss re-configured, UDP 4-tupple %s\n",

			   udp_rss_requested ? "enabled" : "disabled");

			return bnx2x_config_rss_pf(bp, &bp->rss_conf_obj, 0);

		} else {

			return 0;

		}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+52 −8
Original line number Diff line number Diff line
@@ -127,6 +127,17 @@ MODULE_PARM_DESC(debug, " Default debug msglevel"); 


struct workqueue_struct *bnx2x_wq;



struct bnx2x_mac_vals {

	u32 xmac_addr;

	u32 xmac_val;

	u32 emac_addr;

	u32 emac_val;

	u32 umac_addr;

	u32 umac_val;

	u32 bmac_addr;

	u32 bmac_val[2];

};



enum bnx2x_board_type {

	BCM57710 = 0,

	BCM57711,
@@ -9420,12 +9431,19 @@ static inline void bnx2x_undi_int_disable(struct bnx2x *bp) 
		bnx2x_undi_int_disable_e1h(bp);

}



static void bnx2x_prev_unload_close_mac(struct bnx2x *bp)

static void bnx2x_prev_unload_close_mac(struct bnx2x *bp,

					struct bnx2x_mac_vals *vals)

{

	u32 val, base_addr, offset, mask, reset_reg;

	bool mac_stopped = false;

	u8 port = BP_PORT(bp);



	/* reset addresses as they also mark which values were changed */

	vals->bmac_addr = 0;

	vals->umac_addr = 0;

	vals->xmac_addr = 0;

	vals->emac_addr = 0;



	reset_reg = REG_RD(bp, MISC_REG_RESET_REG_2);



	if (!CHIP_IS_E3(bp)) {
@@ -9447,14 +9465,18 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp) 
			 */

			wb_data[0] = REG_RD(bp, base_addr + offset);

			wb_data[1] = REG_RD(bp, base_addr + offset + 0x4);

			vals->bmac_addr = base_addr + offset;

			vals->bmac_val[0] = wb_data[0];

			vals->bmac_val[1] = wb_data[1];

			wb_data[0] &= ~BMAC_CONTROL_RX_ENABLE;

			REG_WR(bp, base_addr + offset, wb_data[0]);

			REG_WR(bp, base_addr + offset + 0x4, wb_data[1]);

			REG_WR(bp, vals->bmac_addr, wb_data[0]);

			REG_WR(bp, vals->bmac_addr + 0x4, wb_data[1]);



		}

		BNX2X_DEV_INFO("Disable emac Rx\n");

		REG_WR(bp, NIG_REG_NIG_EMAC0_EN + BP_PORT(bp)*4, 0);



		vals->emac_addr = NIG_REG_NIG_EMAC0_EN + BP_PORT(bp)*4;

		vals->emac_val = REG_RD(bp, vals->emac_addr);

		REG_WR(bp, vals->emac_addr, 0);

		mac_stopped = true;

	} else {

		if (reset_reg & MISC_REGISTERS_RESET_REG_2_XMAC) {
@@ -9465,14 +9487,18 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp) 
			       val & ~(1 << 1));

			REG_WR(bp, base_addr + XMAC_REG_PFC_CTRL_HI,

			       val | (1 << 1));

			REG_WR(bp, base_addr + XMAC_REG_CTRL, 0);

			vals->xmac_addr = base_addr + XMAC_REG_CTRL;

			vals->xmac_val = REG_RD(bp, vals->xmac_addr);

			REG_WR(bp, vals->xmac_addr, 0);

			mac_stopped = true;

		}

		mask = MISC_REGISTERS_RESET_REG_2_UMAC0 << port;

		if (mask & reset_reg) {

			BNX2X_DEV_INFO("Disable umac Rx\n");

			base_addr = BP_PORT(bp) ? GRCBASE_UMAC1 : GRCBASE_UMAC0;

			REG_WR(bp, base_addr + UMAC_REG_COMMAND_CONFIG, 0);

			vals->umac_addr = base_addr + UMAC_REG_COMMAND_CONFIG;

			vals->umac_val = REG_RD(bp, vals->umac_addr);

			REG_WR(bp, vals->umac_addr, 0);

			mac_stopped = true;

		}

	}
@@ -9664,12 +9690,16 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp) 
{

	u32 reset_reg, tmp_reg = 0, rc;

	bool prev_undi = false;

	struct bnx2x_mac_vals mac_vals;



	/* It is possible a previous function received 'common' answer,

	 * but hasn't loaded yet, therefore creating a scenario of

	 * multiple functions receiving 'common' on the same path.

	 */

	BNX2X_DEV_INFO("Common unload Flow\n");



	memset(&mac_vals, 0, sizeof(mac_vals));



	if (bnx2x_prev_is_path_marked(bp))

		return bnx2x_prev_mcp_done(bp);
@@ -9680,7 +9710,10 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp) 
		u32 timer_count = 1000;



		/* Close the MAC Rx to prevent BRB from filling up */

		bnx2x_prev_unload_close_mac(bp);

		bnx2x_prev_unload_close_mac(bp, &mac_vals);



		/* close LLH filters towards the BRB */

		bnx2x_set_rx_filter(&bp->link_params, 0);



		/* Check if the UNDI driver was previously loaded

		 * UNDI driver initializes CID offset for normal bell to 0x7
@@ -9727,6 +9760,17 @@ static int bnx2x_prev_unload_common(struct bnx2x *bp) 
	/* No packets are in the pipeline, path is ready for reset */

	bnx2x_reset_common(bp);



	if (mac_vals.xmac_addr)

		REG_WR(bp, mac_vals.xmac_addr, mac_vals.xmac_val);

	if (mac_vals.umac_addr)

		REG_WR(bp, mac_vals.umac_addr, mac_vals.umac_val);

	if (mac_vals.emac_addr)

		REG_WR(bp, mac_vals.emac_addr, mac_vals.emac_val);

	if (mac_vals.bmac_addr) {

		REG_WR(bp, mac_vals.bmac_addr, mac_vals.bmac_val[0]);

		REG_WR(bp, mac_vals.bmac_addr + 4, mac_vals.bmac_val[1]);

	}



	rc = bnx2x_prev_mark_path(bp, prev_undi);

	if (rc) {

		bnx2x_prev_mcp_done(bp);