Commit 5de6ac75 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 BPF handling of branch offset adjustmnets on backjumps, from
    Daniel Borkmann.

 2) Make sure selinux knows about SOCK_DESTROY netlink messages, from
    Lorenzo Colitti.

 3) Fix openvswitch tunnel mtu regression, from David Wragg.

 4) Fix ICMP handling of TCP sockets in syn_recv state, from Eric
    Dumazet.

 5) Fix SCTP user hmacid byte ordering bug, from Xin Long.

 6) Fix recursive locking in ipv6 addrconf, from Subash Abhinov
    Kasiviswanathan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  bpf: fix branch offset adjustment on backjumps after patching ctx expansion
  vxlan, gre, geneve: Set a large MTU on ovs-created tunnel devices
  geneve: Relax MTU constraints
  vxlan: Relax MTU constraints
  flow_dissector: Fix unaligned access in __skb_flow_dissector when used by eth_get_headlen
  of: of_mdio: Add marvell, 88e1145 to whitelist of PHY compatibilities.
  selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
  sctp: translate network order to host order when users get a hmacid
  enic: increment devcmd2 result ring in case of timeout
  tg3: Fix for tg3 transmit queue 0 timed out when too many gso_segs
  net:Add sysctl_max_skb_frags
  tcp: do not drop syn_recv on all icmp reports
  ipv6: fix a lockdep splat
  unix: correctly track in-flight fds in sending process user_struct
  update be2net maintainers' email addresses
  dwc_eth_qos: Reset hardware before PHY start
  ipv6: addrconf: Fix recursive spin lock call
parents 721675fc a1b14d27

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -9787,10 +9787,11 @@ S: Supported 
F:	drivers/scsi/be2iscsi/



Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER

M:	Sathya Perla <sathya.perla@avagotech.com>

M:	Ajit Khaparde <ajit.khaparde@avagotech.com>

M:	Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>

M:	Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>

M:	Sathya Perla <sathya.perla@broadcom.com>

M:	Ajit Khaparde <ajit.khaparde@broadcom.com>

M:	Padmanabh Ratnakar <padmanabh.ratnakar@broadcom.com>

M:	Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>

M:	Somnath Kotur <somnath.kotur@broadcom.com>

L:	netdev@vger.kernel.org

W:	http://www.emulex.com

S:	Supported

drivers/net/ethernet/broadcom/tg3.c

+19 −6
Original line number Diff line number Diff line
@@ -7831,6 +7831,14 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, 
	return ret;

}



static bool tg3_tso_bug_gso_check(struct tg3_napi *tnapi, struct sk_buff *skb)

{

	/* Check if we will never have enough descriptors,

	 * as gso_segs can be more than current ring size

	 */

	return skb_shinfo(skb)->gso_segs < tnapi->tx_pending / 3;

}



static netdev_tx_t tg3_start_xmit(struct sk_buff *, struct net_device *);



/* Use GSO to workaround all TSO packets that meet HW bug conditions
@@ -7934,14 +7942,19 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		 * vlan encapsulated.

		 */

		if (skb->protocol == htons(ETH_P_8021Q) ||

		    skb->protocol == htons(ETH_P_8021AD))

		    skb->protocol == htons(ETH_P_8021AD)) {

			if (tg3_tso_bug_gso_check(tnapi, skb))

				return tg3_tso_bug(tp, tnapi, txq, skb);

			goto drop;

		}



		if (!skb_is_gso_v6(skb)) {

			if (unlikely((ETH_HLEN + hdr_len) > 80) &&

			    tg3_flag(tp, TSO_BUG))

			    tg3_flag(tp, TSO_BUG)) {

				if (tg3_tso_bug_gso_check(tnapi, skb))

					return tg3_tso_bug(tp, tnapi, txq, skb);



				goto drop;

			}

			ip_csum = iph->check;

			ip_tot_len = iph->tot_len;

			iph->check = 0;
@@ -8073,7 +8086,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (would_hit_hwbug) {

		tg3_tx_skb_unmap(tnapi, tnapi->tx_prod, i);



		if (mss) {

		if (mss && tg3_tso_bug_gso_check(tnapi, skb)) {

			/* If it's a TSO packet, do GSO instead of

			 * allocating and copying to a large linear SKB

			 */

drivers/net/ethernet/cisco/enic/enic.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#define DRV_NAME		"enic"

#define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"

#define DRV_VERSION		"2.3.0.12"

#define DRV_VERSION		"2.3.0.20"

#define DRV_COPYRIGHT		"Copyright 2008-2013 Cisco Systems, Inc"



#define ENIC_BARS_MAX		6

drivers/net/ethernet/cisco/enic/vnic_dev.c

+12 −7
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ static int _vnic_dev_cmd2(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, 
			  int wait)

{

	struct devcmd2_controller *dc2c = vdev->devcmd2;

	struct devcmd2_result *result = dc2c->result + dc2c->next_result;

	struct devcmd2_result *result;

	u8 color;

	unsigned int i;

	int delay, err;

	u32 fetch_index, new_posted;
@@ -336,13 +337,17 @@ static int _vnic_dev_cmd2(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, 
	if (dc2c->cmd_ring[posted].flags & DEVCMD2_FNORESULT)

		return 0;



	for (delay = 0; delay < wait; delay++) {

		if (result->color == dc2c->color) {

	result = dc2c->result + dc2c->next_result;

	color = dc2c->color;



	dc2c->next_result++;

	if (dc2c->next_result == dc2c->result_size) {

		dc2c->next_result = 0;

		dc2c->color = dc2c->color ? 0 : 1;

	}



	for (delay = 0; delay < wait; delay++) {

		if (result->color == color) {

			if (result->error) {

				err = result->error;

				if (err != ERR_ECMDUNKNOWN ||

drivers/net/ethernet/synopsys/dwc_eth_qos.c

+1 −1
Original line number Diff line number Diff line
@@ -1880,9 +1880,9 @@ static int dwceqos_open(struct net_device *ndev) 
	}

	netdev_reset_queue(ndev);



	dwceqos_init_hw(lp);

	napi_enable(&lp->napi);

	phy_start(lp->phy_dev);

	dwceqos_init_hw(lp);



	netif_start_queue(ndev);

	tasklet_enable(&lp->tx_bdreclaim_tasklet);

CRA Git | Maintained and supported by SUSTech CRA and CCSE