Commit cc5724ce 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:
  Revert "tcp: Always set urgent pointer if it's beyond snd_nxt"
  ipv6: Copy cork options in ip6_append_data
  udp: Fix UDP short packet false positive
  gianfar: Fix potential soft reset race
  gianfar: Fix BD_LENGTH_MASK definition
  cxgb3: Fix lro switch
  iwlwifi: save PCI state before suspend, restore after resume
  iwlwifi: clean key table in iwl_clear_stations_table
parents f01d1d54 a23f4bbd

drivers/net/cxgb3/sge.c

+1 −2
Original line number Diff line number Diff line
@@ -2276,8 +2276,7 @@ no_mem: 
		} else if ((len = ntohl(r->len_cq)) != 0) {

			struct sge_fl *fl;



			if (eth)

				lro = qs->lro_enabled && is_eth_tcp(rss_hi);

			lro &= eth && is_eth_tcp(rss_hi);



			fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];

			if (fl->use_pages) {

drivers/net/gianfar.c

+3 −0
Original line number Diff line number Diff line
@@ -351,6 +351,9 @@ static int gfar_probe(struct of_device *ofdev, 
	/* Reset MAC layer */

	gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);



	/* We need to delay at least 3 TX clocks */

	udelay(2);



	tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);

	gfar_write(&priv->regs->maccfg1, tempval);

drivers/net/gianfar.h

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ extern const char gfar_driver_version[]; 
#define ATTRELI_EI(x) (x)



#define BD_LFLAG(flags) ((flags) << 16)

#define BD_LENGTH_MASK		0x00ff

#define BD_LENGTH_MASK		0x0000ffff



/* TxBD status field bits */

#define TXBD_READY		0x8000

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

+2 −0
Original line number Diff line number Diff line
@@ -4042,6 +4042,7 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state) 
		priv->is_open = 1;

	}



	pci_save_state(pdev);

	pci_set_power_state(pdev, PCI_D3hot);



	return 0;
@@ -4052,6 +4053,7 @@ static int iwl_pci_resume(struct pci_dev *pdev) 
	struct iwl_priv *priv = pci_get_drvdata(pdev);



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);



	if (priv->is_open)

		iwl_mac_start(priv->hw);

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

+3 −0
Original line number Diff line number Diff line
@@ -480,6 +480,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv) 
	priv->num_stations = 0;

	memset(priv->stations, 0, sizeof(priv->stations));



	/* clean ucode key table bit map */

	priv->ucode_key_table = 0;



	spin_unlock_irqrestore(&priv->sta_lock, flags);

}

EXPORT_SYMBOL(iwl_clear_stations_table);

CRA Git | Maintained and supported by SUSTech CRA and CCSE