Commit 533bb8a4 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: (31 commits)
  [BRIDGE]: Fix crash in __ip_route_output_key with bridge netfilter
  [NETFILTER]: ipt_CLUSTERIP: fix race between clusterip_config_find_get and _entry_put
  [IPV6] ADDRCONF: Don't generate temporary address for ip6-ip6 interface.
  [IPV6] ADDRCONF: Ensure disabling multicast RS even if privacy extensions are disabled.
  [IPV6]: Use appropriate sock tclass setting for routing lookup.
  [IPV6]: IPv6 extension header structures need to be packed.
  [IPV6]: Fix ipv6 address fetching in raw6_icmp_error().
  [NET]: Return more appropriate error from eth_validate_addr().
  [ISDN]: Do not validate ISDN net device address prior to interface-up
  [NET]: Fix kernel-doc for skb_segment
  [SOCK] sk_stamp: should be initialized to ktime_set(-1L, 0)
  net: check for underlength tap writes
  net: make struct tun_struct private to tun.c
  [SCTP]: IPv4 vs IPv6 addresses mess in sctp_inet[6]addr_event.
  [SCTP]: Fix compiler warning about const qualifiers
  [SCTP]: Fix protocol violation when receiving an error lenght INIT-ACK
  [SCTP]: Add check for hmac_algo parameter in sctp_verify_param()
  [NET_SCHED] cls_u32: refcounting fix for u32_delete()
  [DCCP]: Fix skb->cb conflicts with IP
  [AX25]: Potential ax25_uid_assoc-s leaks on module unload.
  ...
parents 4f3f8e94 159d8336

drivers/isdn/i4l/isdn_net.c

+1 −0
Original line number Diff line number Diff line
@@ -2010,6 +2010,7 @@ isdn_net_init(struct net_device *ndev) 
	ndev->flags = IFF_NOARP|IFF_POINTOPOINT;

	ndev->type = ARPHRD_ETHER;

	ndev->addr_len = ETH_ALEN;

	ndev->validate_addr = NULL;



	/* for clients with MPPP maybe higher values better */

	ndev->tx_queue_len = 30;

drivers/net/ehea/ehea.h

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0089"

#define DRV_VERSION	"EHEA_0090"



/* eHEA capability flags */

#define DLPAR_PORT_ADD_REM 1
@@ -371,6 +371,7 @@ struct ehea_port_res { 
	struct ehea_q_skb_arr rq2_skba;

	struct ehea_q_skb_arr rq3_skba;

	struct ehea_q_skb_arr sq_skba;

	int sq_skba_size;

	spinlock_t netif_queue;

	int queue_stopped;

	int swqe_refill_th;

drivers/net/ehea/ehea_main.c

+22 −2
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes) 
	pr->rq1_skba.os_skbs = 0;



	if (unlikely(test_bit(__EHEA_STOP_XFER, &ehea_driver_flags))) {

		if (nr_of_wqes > 0)

			pr->rq1_skba.index = index;

		pr->rq1_skba.os_skbs = fill_wqes;

		return;
@@ -1464,7 +1465,9 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr, 
			  init_attr->act_nr_rwqes_rq2,

			  init_attr->act_nr_rwqes_rq3);



	ret = ehea_init_q_skba(&pr->sq_skba, init_attr->act_nr_send_wqes + 1);

	pr->sq_skba_size = init_attr->act_nr_send_wqes + 1;



	ret = ehea_init_q_skba(&pr->sq_skba, pr->sq_skba_size);

	ret |= ehea_init_q_skba(&pr->rq1_skba, init_attr->act_nr_rwqes_rq1 + 1);

	ret |= ehea_init_q_skba(&pr->rq2_skba, init_attr->act_nr_rwqes_rq2 + 1);

	ret |= ehea_init_q_skba(&pr->rq3_skba, init_attr->act_nr_rwqes_rq3 + 1);
@@ -2621,6 +2624,22 @@ void ehea_purge_sq(struct ehea_qp *orig_qp) 
	}

}



void ehea_flush_sq(struct ehea_port *port)

{

	int i;



	for (i = 0; i < port->num_def_qps + port->num_add_tx_qps; i++) {

		struct ehea_port_res *pr = &port->port_res[i];

		int swqe_max = pr->sq_skba_size - 2 - pr->swqe_ll_count;

		int k = 0;

		while (atomic_read(&pr->swqe_avail) < swqe_max) {

			msleep(5);

			if (++k == 20)

				break;

		}

	}

}



int ehea_stop_qps(struct net_device *dev)

{

	struct ehea_port *port = netdev_priv(dev);
@@ -2845,6 +2864,7 @@ static void ehea_rereg_mrs(struct work_struct *work) 
					if (dev->flags & IFF_UP) {

						down(&port->port_lock);

						netif_stop_queue(dev);

						ehea_flush_sq(port);

						ret = ehea_stop_qps(dev);

						if (ret) {

							up(&port->port_lock);

drivers/net/forcedeth.c

+24 −2
Original line number Diff line number Diff line
@@ -5316,8 +5316,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 


	/* check the workaround bit for correct mac address order */

	txreg = readl(base + NvRegTransmitPoll);

	if ((txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) ||

	    (id->driver_data & DEV_HAS_CORRECT_MACADDR)) {

	if (id->driver_data & DEV_HAS_CORRECT_MACADDR) {

		/* mac address is already in correct order */

		dev->dev_addr[0] = (np->orig_mac[0] >>  0) & 0xff;

		dev->dev_addr[1] = (np->orig_mac[0] >>  8) & 0xff;
@@ -5325,6 +5324,22 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i 
		dev->dev_addr[3] = (np->orig_mac[0] >> 24) & 0xff;

		dev->dev_addr[4] = (np->orig_mac[1] >>  0) & 0xff;

		dev->dev_addr[5] = (np->orig_mac[1] >>  8) & 0xff;

	} else if (txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) {

		/* mac address is already in correct order */

		dev->dev_addr[0] = (np->orig_mac[0] >>  0) & 0xff;

		dev->dev_addr[1] = (np->orig_mac[0] >>  8) & 0xff;

		dev->dev_addr[2] = (np->orig_mac[0] >> 16) & 0xff;

		dev->dev_addr[3] = (np->orig_mac[0] >> 24) & 0xff;

		dev->dev_addr[4] = (np->orig_mac[1] >>  0) & 0xff;

		dev->dev_addr[5] = (np->orig_mac[1] >>  8) & 0xff;

		/*

		 * Set orig mac address back to the reversed version.

		 * This flag will be cleared during low power transition.

		 * Therefore, we should always put back the reversed address.

		 */

		np->orig_mac[0] = (dev->dev_addr[5] << 0) + (dev->dev_addr[4] << 8) +

			(dev->dev_addr[3] << 16) + (dev->dev_addr[2] << 24);

		np->orig_mac[1] = (dev->dev_addr[1] << 0) + (dev->dev_addr[0] << 8);

	} else {

		/* need to reverse mac address to correct order */

		dev->dev_addr[0] = (np->orig_mac[1] >>  8) & 0xff;
@@ -5595,7 +5610,9 @@ out: 
static int nv_resume(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	u8 __iomem *base = get_hwbase(dev);

	int rc = 0;

	u32 txreg;



	if (!netif_running(dev))

		goto out;
@@ -5606,6 +5623,11 @@ static int nv_resume(struct pci_dev *pdev) 
	pci_restore_state(pdev);

	pci_enable_wake(pdev, PCI_D0, 0);



	/* restore mac address reverse flag */

	txreg = readl(base + NvRegTransmitPoll);

	txreg |= NVREG_TRANSMITPOLL_MAC_ADDR_REV;

	writel(txreg, base + NvRegTransmitPoll);



	rc = nv_open(dev);

out:

	return rc;

drivers/net/fs_enet/fs_enet-main.c

+2 −1
Original line number Diff line number Diff line
@@ -835,6 +835,7 @@ static int fs_enet_close(struct net_device *dev) 


	netif_stop_queue(dev);

	netif_carrier_off(dev);

	if (fep->fpi->use_napi)

		napi_disable(&fep->napi);

	phy_stop(fep->phydev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE