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

Commit d5df2a16 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/bnx2x_main.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/rt2x00/rt73usb.c
parents d4a4aba6 db434ac6

drivers/net/bnx2x.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ struct sw_rx_page { 
#define PAGES_PER_SGE			(1 << PAGES_PER_SGE_SHIFT)

#define SGE_PAGE_SIZE			PAGE_SIZE

#define SGE_PAGE_SHIFT			PAGE_SHIFT

#define SGE_PAGE_ALIGN(addr)		PAGE_ALIGN(addr)

#define SGE_PAGE_ALIGN(addr)		PAGE_ALIGN((typeof(PAGE_SIZE))addr)



/* SGE ring related macros */

#define NUM_RX_SGE_PAGES		2

drivers/net/wireless/iwlwifi/iwl-agn.c

+1 −1
Original line number Diff line number Diff line
@@ -3482,8 +3482,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
 out_iounmap:

	pci_iounmap(pdev, priv->hw_base);

 out_pci_release_regions:

	pci_release_regions(pdev);

	pci_set_drvdata(pdev, NULL);

	pci_release_regions(pdev);

 out_pci_disable_device:

	pci_disable_device(pdev);

 out_ieee80211_free_hw:

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −2
Original line number Diff line number Diff line
@@ -5110,7 +5110,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
	/* amp init */

	err = priv->cfg->ops->lib->apm_ops.init(priv);

	if (err < 0) {

		IWL_DEBUG_INFO(priv, "Failed to init APMG\n");

		IWL_DEBUG_INFO(priv, "Failed to init the card\n");

		goto out_iounmap;

	}
@@ -5234,8 +5234,8 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
 out_pci_release_regions:

	pci_release_regions(pdev);

 out_pci_disable_device:

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

	pci_disable_device(pdev);

 out_ieee80211_free_hw:

	ieee80211_free_hw(priv->hw);

 out:

drivers/net/wireless/p54/p54common.c

+6 −3
Original line number Diff line number Diff line
@@ -849,10 +849,11 @@ static struct sk_buff *p54_find_tx_entry(struct ieee80211_hw *dev, 
					   __le32 req_id)

{

	struct p54_common *priv = dev->priv;

	struct sk_buff *entry = priv->tx_queue.next;

	struct sk_buff *entry;

	unsigned long flags;



	spin_lock_irqsave(&priv->tx_queue.lock, flags);

	entry = priv->tx_queue.next;

	while (entry != (struct sk_buff *)&priv->tx_queue) {

		struct p54_hdr *hdr = (struct p54_hdr *) entry->data;
@@ -871,7 +872,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb) 
	struct p54_common *priv = dev->priv;

	struct p54_hdr *hdr = (struct p54_hdr *) skb->data;

	struct p54_frame_sent *payload = (struct p54_frame_sent *) hdr->data;

	struct sk_buff *entry = (struct sk_buff *) priv->tx_queue.next;

	struct sk_buff *entry;

	u32 addr = le32_to_cpu(hdr->req_id) - priv->headroom;

	struct p54_tx_info *range = NULL;

	u32 freed = 0;
@@ -880,6 +881,7 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb) 
	int count, idx;



	spin_lock_irqsave(&priv->tx_queue.lock, flags);

	entry = (struct sk_buff *) priv->tx_queue.next;

	while (entry != (struct sk_buff *)&priv->tx_queue) {

		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry);

		struct p54_hdr *entry_hdr;
@@ -1122,7 +1124,7 @@ static int p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb, 
			       struct p54_hdr *data, u32 len)

{

	struct p54_common *priv = dev->priv;

	struct sk_buff *entry = priv->tx_queue.next;

	struct sk_buff *entry;

	struct sk_buff *target_skb = NULL;

	struct ieee80211_tx_info *info;

	struct p54_tx_info *range;
@@ -1160,6 +1162,7 @@ static int p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb, 
		}

	}



	entry = priv->tx_queue.next;

	while (left--) {

		u32 hole_size;

		info = IEEE80211_SKB_CB(entry);

drivers/net/wireless/rt2x00/rt2500usb.c

+8 −0
Original line number Diff line number Diff line
@@ -2004,6 +2004,8 @@ static struct usb_device_id rt2500usb_device_table[] = { 
	{ USB_DEVICE(0x13b1, 0x000d), USB_DEVICE_DATA(&rt2500usb_ops) },

	{ USB_DEVICE(0x13b1, 0x0011), USB_DEVICE_DATA(&rt2500usb_ops) },

	{ USB_DEVICE(0x13b1, 0x001a), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* CNet */

	{ USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* Conceptronic */

	{ USB_DEVICE(0x14b2, 0x3c02), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* D-LINK */
@@ -2028,14 +2030,20 @@ static struct usb_device_id rt2500usb_device_table[] = { 
	{ USB_DEVICE(0x148f, 0x2570), USB_DEVICE_DATA(&rt2500usb_ops) },

	{ USB_DEVICE(0x148f, 0x2573), USB_DEVICE_DATA(&rt2500usb_ops) },

	{ USB_DEVICE(0x148f, 0x9020), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* Sagem */

	{ USB_DEVICE(0x079b, 0x004b), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* Siemens */

	{ USB_DEVICE(0x0681, 0x3c06), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* SMC */

	{ USB_DEVICE(0x0707, 0xee13), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* Spairon */

	{ USB_DEVICE(0x114b, 0x0110), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* SURECOM */

	{ USB_DEVICE(0x0769, 0x11f3), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* Trust */

	{ USB_DEVICE(0x0eb0, 0x9020), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* VTech */

	{ USB_DEVICE(0x0f88, 0x3012), USB_DEVICE_DATA(&rt2500usb_ops) },

	/* Zinwell */

	{ USB_DEVICE(0x5a57, 0x0260), USB_DEVICE_DATA(&rt2500usb_ops) },

	{ 0, }