Commit cb1817b3 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: (30 commits)
  xfrm: Restrict extended sequence numbers to esp
  xfrm: Check for esn buffer len in xfrm_new_ae
  xfrm: Assign esn pointers when cloning a state
  xfrm: Move the test on replay window size into the replay check functions
  netdev: bfin_mac: document TE setting in RMII modes
  drivers net: Fix declaration ordering in inline functions.
  cxgb3: Apply interrupt coalescing settings to all queues
  net: Always allocate at least 16 skb frags regardless of page size
  ipv4: Don't ip_rt_put() an error pointer in RAW sockets.
  net: fix ethtool->set_flags not intended -EINVAL return value
  mlx4_en: Fix loss of promiscuity
  tg3: Fix inline keyword usage
  tg3: use <linux/io.h> and <linux/uaccess.h> instead <asm/io.h> and <asm/uaccess.h>
  net: use CHECKSUM_NONE instead of magic number
  Net / jme: Do not use legacy PCI power management
  myri10ge: small rx_done refactoring
  bridge: notify applications if address of bridge device changes
  ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo()
  can: c_can: Fix tx_bytes accounting
  can: c_can_platform: fix irq check in probe
  ...
parents 89078d57 02aadf72

drivers/net/bfin_mac.c

+11 −2
Original line number Diff line number Diff line
@@ -1237,8 +1237,17 @@ static int bfin_mac_enable(struct phy_device *phydev) 


	if (phydev->interface == PHY_INTERFACE_MODE_RMII) {

		opmode |= RMII; /* For Now only 100MBit are supported */

#if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) && CONFIG_BF_REV_0_2

#if defined(CONFIG_BF537) || defined(CONFIG_BF536)

		if (__SILICON_REVISION__ < 3) {

			/*

			 * This isn't publicly documented (fun times!), but in

			 * silicon <=0.2, the RX and TX pins are clocked together.

			 * So in order to recv, we must enable the transmit side

			 * as well.  This will cause a spurious TX interrupt too,

			 * but we can easily consume that.

			 */

			opmode |= TE;

		}

#endif

	}

drivers/net/bnx2.c

+1 −1
Original line number Diff line number Diff line
@@ -8317,7 +8317,7 @@ static const struct net_device_ops bnx2_netdev_ops = { 
#endif

};



static void inline vlan_features_add(struct net_device *dev, u32 flags)

static inline void vlan_features_add(struct net_device *dev, u32 flags)

{

	dev->vlan_features |= flags;

}

drivers/net/can/c_can/c_can.c

+5 −11
Original line number Diff line number Diff line
@@ -588,11 +588,6 @@ static void c_can_chip_config(struct net_device *dev) 
{

	struct c_can_priv *priv = netdev_priv(dev);



	if (priv->can.ctrlmode & CAN_CTRLMODE_ONE_SHOT)

		/* disable automatic retransmission */

		priv->write_reg(priv, &priv->regs->control,

				CONTROL_DISABLE_AR);

	else

	/* enable automatic retransmission */

	priv->write_reg(priv, &priv->regs->control,

			CONTROL_ENABLE_AR);
@@ -704,7 +699,6 @@ static void c_can_do_tx(struct net_device *dev) 


	for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) {

		msg_obj_no = get_tx_echo_msg_obj(priv);

		c_can_inval_msg_object(dev, 0, msg_obj_no);

		val = c_can_read_reg32(priv, &priv->regs->txrqst1);

		if (!(val & (1 << msg_obj_no))) {

			can_get_echo_skb(dev,
@@ -713,6 +707,7 @@ static void c_can_do_tx(struct net_device *dev) 
					&priv->regs->ifregs[0].msg_cntrl)

					& IF_MCONT_DLC_MASK;

			stats->tx_packets++;

			c_can_inval_msg_object(dev, 0, msg_obj_no);

		}

	}
@@ -1112,8 +1107,7 @@ struct net_device *alloc_c_can_dev(void) 
	priv->can.bittiming_const = &c_can_bittiming_const;

	priv->can.do_set_mode = c_can_set_mode;

	priv->can.do_get_berr_counter = c_can_get_berr_counter;

	priv->can.ctrlmode_supported = CAN_CTRLMODE_ONE_SHOT |

					CAN_CTRLMODE_LOOPBACK |

	priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |

					CAN_CTRLMODE_LISTENONLY |

					CAN_CTRLMODE_BERR_REPORTING;

drivers/net/can/c_can/c_can_platform.c

+5 −4
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 
	void __iomem *addr;

	struct net_device *dev;

	struct c_can_priv *priv;

	struct resource *mem, *irq;

	struct resource *mem;

	int irq;

#ifdef CONFIG_HAVE_CLK

	struct clk *clk;
@@ -88,8 +89,8 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 


	/* get the platform data */

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!mem || (irq <= 0)) {

	irq = platform_get_irq(pdev, 0);

	if (!mem || irq <= 0) {

		ret = -ENODEV;

		goto exit_free_clk;

	}
@@ -117,7 +118,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 


	priv = netdev_priv(dev);



	dev->irq = irq->start;

	dev->irq = irq;

	priv->regs = addr;

#ifdef CONFIG_HAVE_CLK

	priv->can.clock.freq = clk_get_rate(clk);

drivers/net/cxgb3/cxgb3_main.c

+10 −4
Original line number Diff line number Diff line
@@ -1983,14 +1983,20 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) 
{

	struct port_info *pi = netdev_priv(dev);

	struct adapter *adapter = pi->adapter;

	struct qset_params *qsp = &adapter->params.sge.qset[0];

	struct sge_qset *qs = &adapter->sge.qs[0];

	struct qset_params *qsp;

	struct sge_qset *qs;

	int i;



	if (c->rx_coalesce_usecs * 10 > M_NEWTIMER)

		return -EINVAL;



	for (i = 0; i < pi->nqsets; i++) {

		qsp = &adapter->params.sge.qset[i];

		qs = &adapter->sge.qs[i];

		qsp->coalesce_usecs = c->rx_coalesce_usecs;

		t3_update_qset_coalesce(qs, qsp);

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE