Commit 505f48b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  fib_rules: fix unresolved_rules counting
  r8169: fix wrong eee setting for rlt8111evl
  r8169: fix driver shutdown WoL regression.
  ehea: Change maintainer to me
  pptp: pptp_rcv_core() misses pskb_may_pull() call
  tproxy: copy transparent flag when creating a time wait
  pptp: fix skb leak in pptp_xmit()
  bonding: use local function pointer of bond->recv_probe in bond_handle_frame
  smsc911x: Add support for SMSC LAN89218
  tg3: negate USE_PHYLIB flag check
  netconsole: enable netconsole can make net_device refcnt incorrent
  bluetooth: Properly clone LSM attributes to newly created child connections
  l2tp: fix a potential skb leak in l2tp_xmit_skb()
  bridge: fix hang on removal of bridge via netlink
  x25: Prevent skb overreads when checking call user data
  x25: Handle undersized/fragmented skbs
  x25: Validate incoming call user data lengths
  udplite: fast-path computation of checksum coverage
  IPVS netns shutdown/startup dead-lock
  netfilter: nf_conntrack: fix event flooding in GRE protocol tracker
parents 486cf46f afaef734

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2460,7 +2460,7 @@ S: Supported 
F:	drivers/infiniband/hw/ehca/



EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER

M:	Breno Leitao <leitao@linux.vnet.ibm.com>

M:	Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ehea/

drivers/net/bonding/bond_main.c

+5 −2
Original line number Diff line number Diff line
@@ -1435,6 +1435,8 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
	struct sk_buff *skb = *pskb;

	struct slave *slave;

	struct bonding *bond;

	void (*recv_probe)(struct sk_buff *, struct bonding *,

				struct slave *);



	skb = skb_share_check(skb, GFP_ATOMIC);

	if (unlikely(!skb))
@@ -1448,11 +1450,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) 
	if (bond->params.arp_interval)

		slave->dev->last_rx = jiffies;



	if (bond->recv_probe) {

	recv_probe = ACCESS_ONCE(bond->recv_probe);

	if (recv_probe) {

		struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);



		if (likely(nskb)) {

			bond->recv_probe(nskb, bond, slave);

			recv_probe(nskb, bond, slave);

			dev_kfree_skb(nskb);

		}

	}

drivers/net/netconsole.c

+5 −0
Original line number Diff line number Diff line
@@ -307,6 +307,11 @@ static ssize_t store_enabled(struct netconsole_target *nt, 
		return err;

	if (enabled < 0 || enabled > 1)

		return -EINVAL;

	if (enabled == nt->enabled) {

		printk(KERN_INFO "netconsole: network logging has already %s\n",

				nt->enabled ? "started" : "stopped");

		return -EINVAL;

	}



	if (enabled) {	/* 1 */

drivers/net/pptp.c

+14 −8
Original line number Diff line number Diff line
@@ -285,8 +285,10 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) 
	ip_send_check(iph);



	ip_local_out(skb);

	return 1;



tx_error:

	kfree_skb(skb);

	return 1;

}
@@ -305,11 +307,18 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb) 
	}



	header = (struct pptp_gre_header *)(skb->data);

	headersize  = sizeof(*header);



	/* test if acknowledgement present */

	if (PPTP_GRE_IS_A(header->ver)) {

		__u32 ack = (PPTP_GRE_IS_S(header->flags)) ?

				header->ack : header->seq; /* ack in different place if S = 0 */

		__u32 ack;



		if (!pskb_may_pull(skb, headersize))

			goto drop;

		header = (struct pptp_gre_header *)(skb->data);



		/* ack in different place if S = 0 */

		ack = PPTP_GRE_IS_S(header->flags) ? header->ack : header->seq;



		ack = ntohl(ack);
@@ -318,21 +327,18 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb) 
		/* also handle sequence number wrap-around  */

		if (WRAPPED(ack, opt->ack_recv))

			opt->ack_recv = ack;

	} else {

		headersize -= sizeof(header->ack);

	}



	/* test if payload present */

	if (!PPTP_GRE_IS_S(header->flags))

		goto drop;



	headersize  = sizeof(*header);

	payload_len = ntohs(header->payload_len);

	seq         = ntohl(header->seq);



	/* no ack present? */

	if (!PPTP_GRE_IS_A(header->ver))

		headersize -= sizeof(header->ack);

	/* check for incomplete packet (length smaller than expected) */

	if (skb->len - headersize < payload_len)

	if (!pskb_may_pull(skb, headersize + payload_len))

		goto drop;



	payload = skb->data + headersize;

drivers/net/r8169.c

+57 −33
Original line number Diff line number Diff line
@@ -2859,7 +2859,7 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp) 
	rtl_writephy(tp, 0x1f, 0x0004);

	rtl_writephy(tp, 0x1f, 0x0007);

	rtl_writephy(tp, 0x1e, 0x0020);

	rtl_w1w0_phy(tp, 0x06, 0x0000, 0x0100);

	rtl_w1w0_phy(tp, 0x15, 0x0000, 0x0100);

	rtl_writephy(tp, 0x1f, 0x0002);

	rtl_writephy(tp, 0x1f, 0x0000);

	rtl_writephy(tp, 0x0d, 0x0007);
@@ -3316,6 +3316,37 @@ static void __devinit rtl_init_mdio_ops(struct rtl8169_private *tp) 
	}

}



static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)

{

	void __iomem *ioaddr = tp->mmio_addr;



	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_29:

	case RTL_GIGA_MAC_VER_30:

	case RTL_GIGA_MAC_VER_32:

	case RTL_GIGA_MAC_VER_33:

	case RTL_GIGA_MAC_VER_34:

		RTL_W32(RxConfig, RTL_R32(RxConfig) |

			AcceptBroadcast | AcceptMulticast | AcceptMyPhys);

		break;

	default:

		break;

	}

}



static bool rtl_wol_pll_power_down(struct rtl8169_private *tp)

{

	if (!(__rtl8169_get_wol(tp) & WAKE_ANY))

		return false;



	rtl_writephy(tp, 0x1f, 0x0000);

	rtl_writephy(tp, MII_BMCR, 0x0000);



	rtl_wol_suspend_quirk(tp);



	return true;

}



static void r810x_phy_power_down(struct rtl8169_private *tp)

{

	rtl_writephy(tp, 0x1f, 0x0000);
@@ -3330,18 +3361,8 @@ static void r810x_phy_power_up(struct rtl8169_private *tp) 


static void r810x_pll_power_down(struct rtl8169_private *tp)

{

	void __iomem *ioaddr = tp->mmio_addr;



	if (__rtl8169_get_wol(tp) & WAKE_ANY) {

		rtl_writephy(tp, 0x1f, 0x0000);

		rtl_writephy(tp, MII_BMCR, 0x0000);



		if (tp->mac_version == RTL_GIGA_MAC_VER_29 ||

		    tp->mac_version == RTL_GIGA_MAC_VER_30)

			RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast |

				AcceptMulticast | AcceptMyPhys);

	if (rtl_wol_pll_power_down(tp))

		return;

	}



	r810x_phy_power_down(tp);

}
@@ -3430,17 +3451,8 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) 
	    tp->mac_version == RTL_GIGA_MAC_VER_33)

		rtl_ephy_write(ioaddr, 0x19, 0xff64);



	if (__rtl8169_get_wol(tp) & WAKE_ANY) {

		rtl_writephy(tp, 0x1f, 0x0000);

		rtl_writephy(tp, MII_BMCR, 0x0000);



		if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||

		    tp->mac_version == RTL_GIGA_MAC_VER_33 ||

		    tp->mac_version == RTL_GIGA_MAC_VER_34)

			RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast |

				AcceptMulticast | AcceptMyPhys);

	if (rtl_wol_pll_power_down(tp))

		return;

	}



	r8168_phy_power_down(tp);
@@ -5788,11 +5800,30 @@ static const struct dev_pm_ops rtl8169_pm_ops = { 


#endif /* !CONFIG_PM */



static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp)

{

	void __iomem *ioaddr = tp->mmio_addr;



	/* WoL fails with 8168b when the receiver is disabled. */

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_11:

	case RTL_GIGA_MAC_VER_12:

	case RTL_GIGA_MAC_VER_17:

		pci_clear_master(tp->pci_dev);



		RTL_W8(ChipCmd, CmdRxEnb);

		/* PCI commit */

		RTL_R8(ChipCmd);

		break;

	default:

		break;

	}

}



static void rtl_shutdown(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);

	void __iomem *ioaddr = tp->mmio_addr;



	rtl8169_net_suspend(dev);
@@ -5806,16 +5837,9 @@ static void rtl_shutdown(struct pci_dev *pdev) 
	spin_unlock_irq(&tp->lock);



	if (system_state == SYSTEM_POWER_OFF) {

		/* WoL fails with 8168b when the receiver is disabled. */

		if ((tp->mac_version == RTL_GIGA_MAC_VER_11 ||

		     tp->mac_version == RTL_GIGA_MAC_VER_12 ||

		     tp->mac_version == RTL_GIGA_MAC_VER_17) &&

		    (tp->features & RTL_FEATURE_WOL)) {

			pci_clear_master(pdev);



			RTL_W8(ChipCmd, CmdRxEnb);

			/* PCI commit */

			RTL_R8(ChipCmd);

		if (__rtl8169_get_wol(tp) & WAKE_ANY) {

			rtl_wol_suspend_quirk(tp);

			rtl_wol_shutdown_quirk(tp);

		}



		pci_wake_from_d3(pdev, true);

CRA Git | Maintained and supported by SUSTech CRA and CCSE