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

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
  IPVS: Use global mutex in ip_vs_app.c
  ipvs: fix a typo in __ip_vs_control_init()
  veth: Fix the byte counters
  net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries.
  macvlan: Fix use after free of struct macvlan_port.
  net: fix incorrect spelling in drop monitor protocol
  can: c_can: Do basic c_can configuration _before_ enabling the interrupts
  net/appletalk: fix atalk_release use after free
  ipx: fix ipx_release()
  snmp: SNMP_UPD_PO_STATS_BH() always called from softirq
  l2tp: fix possible oops on l2tp_eth module unload
  xfrm: Fix initialize repl field of struct xfrm_state
  netfilter: ipt_CLUSTERIP: fix buffer overflow
  netfilter: xtables: fix reentrancy
  netfilter: ipset: fix checking the type revision at create command
  netfilter: ipset: fix address ranges at hash:*port* types
  niu: Rename NIU parent platform device name to fix conflict.
  r8169: fix a bug in rtl8169_init_phy()
  bonding: fix a typo in a comment
  ftmac100: use resource_size()
  ...
parents eddecbb6 736561a0

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2130,7 +2130,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) 
}



/*

* First release a slave and than destroy the bond if no more slaves are left.

* First release a slave and then destroy the bond if no more slaves are left.

* Must be under rtnl_lock when this function is called.

*/

static int  bond_release_and_destroy(struct net_device *bond_dev,

drivers/net/can/c_can/c_can.c

+3 −3
Original line number Diff line number Diff line
@@ -633,9 +633,6 @@ static void c_can_start(struct net_device *dev) 
{

	struct c_can_priv *priv = netdev_priv(dev);



	/* enable status change, error and module interrupts */

	c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);



	/* basic c_can configuration */

	c_can_chip_config(dev);
@@ -643,6 +640,9 @@ static void c_can_start(struct net_device *dev) 


	/* reset tx helper pointers */

	priv->tx_next = priv->tx_echo = 0;



	/* enable status change, error and module interrupts */

	c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);

}



static void c_can_stop(struct net_device *dev)

drivers/net/ftmac100.c

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ static int ftmac100_probe(struct platform_device *pdev) 
		goto err_req_mem;

	}



	priv->base = ioremap(res->start, res->end - res->start);

	priv->base = ioremap(res->start, resource_size(res));

	if (!priv->base) {

		dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n");

		err = -EIO;

drivers/net/gianfar.c

+14 −2
Original line number Diff line number Diff line
@@ -949,6 +949,11 @@ static void gfar_detect_errata(struct gfar_private *priv) 
			(pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))

		priv->errata |= GFAR_ERRATA_A002;



	/* MPC8313 Rev < 2.0, MPC8548 rev 2.0 */

	if ((pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) ||

			(pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020))

		priv->errata |= GFAR_ERRATA_12;



	if (priv->errata)

		dev_info(dev, "enabled errata workarounds, flags: 0x%x\n",

			 priv->errata);
@@ -2154,9 +2159,16 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* Set up checksumming */

	if (CHECKSUM_PARTIAL == skb->ip_summed) {

		fcb = gfar_add_fcb(skb);

		/* as specified by errata */

		if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_12)

			     && ((unsigned long)fcb % 0x20) > 0x18)) {

			__skb_pull(skb, GMAC_FCB_LEN);

			skb_checksum_help(skb);

		} else {

			lstatus |= BD_LFLAG(TXBD_TOE);

			gfar_tx_checksum(skb, fcb);

		}

	}



	if (vlan_tx_tag_present(skb)) {

		if (unlikely(NULL == fcb)) {

drivers/net/gianfar.h

+1 −0
Original line number Diff line number Diff line
@@ -1039,6 +1039,7 @@ enum gfar_errata { 
	GFAR_ERRATA_74		= 0x01,

	GFAR_ERRATA_76		= 0x02,

	GFAR_ERRATA_A002	= 0x04,

	GFAR_ERRATA_12		= 0x08, /* a.k.a errata eTSEC49 */

};



/* Struct stolen almost completely (and shamelessly) from the FCC enet source