Commit df597efb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
parents a33bc5c1 0a924578

Documentation/DocBook/kernel-hacking.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i); 
   </para>



   <programlisting>

__u32 ipaddress;

printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));

__be32 ipaddress;

printk(KERN_INFO "my ip: %pI4\n", &amp;ipaddress);

   </programlisting>



   <para>

drivers/net/3c515.c

+3 −1
Original line number Diff line number Diff line
@@ -832,7 +832,9 @@ static int corkscrew_open(struct net_device *dev) 
			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */

			vp->rx_ring[i].addr = isa_virt_to_bus(skb->data);

		}

		vp->rx_ring[i - 1].next = isa_virt_to_bus(&vp->rx_ring[0]);	/* Wrap the ring. */

		if (i != 0)

			vp->rx_ring[i - 1].next =

				isa_virt_to_bus(&vp->rx_ring[0]);	/* Wrap the ring. */

		outl(isa_virt_to_bus(&vp->rx_ring[0]), ioaddr + UpListPtr);

	}

	if (vp->full_bus_master_tx) {	/* Boomerang bus master Tx. */

drivers/net/at1700.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) 
				pos3 = mca_read_stored_pos( slot, 3 );

				pos4 = mca_read_stored_pos( slot, 4 );



				for (l_i = 0; l_i < 0x09; l_i++)

				for (l_i = 0; l_i < 8; l_i++)

					if (( pos3 & 0x07) == at1700_ioaddr_pattern[l_i])

						break;

				ioaddr = at1700_mca_probe_list[l_i];

drivers/net/cnic.c

+21 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static int cnic_send_nlmsg(struct cnic_local *cp, u32 type, 
	}



	rcu_read_lock();

	ulp_ops = rcu_dereference(cp->ulp_ops[CNIC_ULP_ISCSI]);

	ulp_ops = rcu_dereference(cnic_ulp_tbl[CNIC_ULP_ISCSI]);

	if (ulp_ops)

		ulp_ops->iscsi_nl_send_msg(cp->dev, msg_type, buf, len);

	rcu_read_unlock();
@@ -319,6 +319,20 @@ static int cnic_abort_prep(struct cnic_sock *csk) 
	return 0;

}



static void cnic_uio_stop(void)

{

	struct cnic_dev *dev;



	read_lock(&cnic_dev_lock);

	list_for_each_entry(dev, &cnic_dev_list, list) {

		struct cnic_local *cp = dev->cnic_priv;



		if (cp->cnic_uinfo)

			cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);

	}

	read_unlock(&cnic_dev_lock);

}



int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops)

{

	struct cnic_dev *dev;
@@ -390,6 +404,9 @@ int cnic_unregister_driver(int ulp_type) 
	}

	read_unlock(&cnic_dev_lock);



	if (ulp_type == CNIC_ULP_ISCSI)

		cnic_uio_stop();



	rcu_assign_pointer(cnic_ulp_tbl[ulp_type], NULL);



	mutex_unlock(&cnic_lock);
@@ -632,7 +649,6 @@ static void cnic_free_resc(struct cnic_dev *dev) 
	int i = 0;



	if (cp->cnic_uinfo) {

		cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);

		while (cp->uio_dev != -1 && i < 15) {

			msleep(100);

			i++;
@@ -1057,6 +1073,9 @@ static void cnic_ulp_stop(struct cnic_dev *dev) 
	struct cnic_local *cp = dev->cnic_priv;

	int if_type;



	if (cp->cnic_uinfo)

		cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);



	rcu_read_lock();

	for (if_type = 0; if_type < MAX_CNIC_ULP_TYPE; if_type++) {

		struct cnic_ulp_ops *ulp_ops;

drivers/net/eepro.c

+1 −1
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ int __init init_module(void) 
		printk(KERN_INFO "eepro_init_module: Auto-detecting boards (May God protect us...)\n");

	}



	for (i = 0; io[i] != -1 && i < MAX_EEPRO; i++) {

	for (i = 0; i < MAX_EEPRO && io[i] != -1; i++) {

		dev = alloc_etherdev(sizeof(struct eepro_local));

		if (!dev)

			break;