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: pkt_sched: sch_sfq: dump a real number of flows atm: [fore200e] use MODULE_FIRMWARE() and other suggested cleanups netfilter: make security table depend on NETFILTER_ADVANCED tcp: Clear probes_out more aggressively in tcp_ack(). e1000e: fix e1000_netpoll(), remove extraneous e1000_clean_tx_irq() call net: Update entry in af_family_clock_key_strings netdev: Remove warning from __netif_schedule(). sky2: don't stop queue on shutdown
This commit is contained in:
Linus Torvalds
commit
c3c2233d84
9 changed files with 24 additions and 19 deletions
|
|
@ -2562,7 +2562,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)
|
|||
const struct firmware *firmware;
|
||||
struct device *device;
|
||||
struct fw_header *fw_header;
|
||||
u32 *fw_data, fw_size;
|
||||
const __le32 *fw_data;
|
||||
u32 fw_size;
|
||||
u32 __iomem *load_addr;
|
||||
char buf[48];
|
||||
int err = -ENODEV;
|
||||
|
|
@ -2582,7 +2583,7 @@ fore200e_load_and_start_fw(struct fore200e* fore200e)
|
|||
return err;
|
||||
}
|
||||
|
||||
fw_data = (u32 *) firmware->data;
|
||||
fw_data = (__le32 *) firmware->data;
|
||||
fw_size = firmware->size / sizeof(u32);
|
||||
fw_header = (struct fw_header *) firmware->data;
|
||||
load_addr = fore200e->virt_base + le32_to_cpu(fw_header->load_offset);
|
||||
|
|
@ -3199,6 +3200,14 @@ static const struct fore200e_bus fore200e_bus[] = {
|
|||
{}
|
||||
};
|
||||
|
||||
#ifdef MODULE_LICENSE
|
||||
MODULE_LICENSE("GPL");
|
||||
#ifdef CONFIG_PCI
|
||||
#ifdef __LITTLE_ENDIAN__
|
||||
MODULE_FIRMWARE("pca200e.bin");
|
||||
#else
|
||||
MODULE_FIRMWARE("pca200e_ecd.bin2");
|
||||
#endif
|
||||
#endif /* CONFIG_PCI */
|
||||
#ifdef CONFIG_SBUS
|
||||
MODULE_FIRMWARE("sba200e_ecd.bin2");
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4067,8 +4067,6 @@ static void e1000_netpoll(struct net_device *netdev)
|
|||
disable_irq(adapter->pdev->irq);
|
||||
e1000_intr(adapter->pdev->irq, netdev);
|
||||
|
||||
e1000_clean_tx_irq(adapter);
|
||||
|
||||
enable_irq(adapter->pdev->irq);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1829,9 +1829,6 @@ static int sky2_down(struct net_device *dev)
|
|||
if (netif_msg_ifdown(sky2))
|
||||
printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
|
||||
|
||||
/* Stop more packets from being queued */
|
||||
netif_stop_queue(dev);
|
||||
|
||||
/* Disable port IRQ */
|
||||
imask = sky2_read32(hw, B0_IMSK);
|
||||
imask &= ~portirq_msk[port];
|
||||
|
|
@ -1887,8 +1884,6 @@ static int sky2_down(struct net_device *dev)
|
|||
|
||||
sky2_phy_power_down(hw, port);
|
||||
|
||||
netif_carrier_off(dev);
|
||||
|
||||
/* turn off LED's */
|
||||
sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
|
||||
|
||||
|
|
|
|||
|
|
@ -1341,9 +1341,6 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
void __netif_schedule(struct Qdisc *q)
|
||||
{
|
||||
if (WARN_ON_ONCE(q == &noop_qdisc))
|
||||
return;
|
||||
|
||||
if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) {
|
||||
struct softnet_data *sd;
|
||||
unsigned long flags;
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = {
|
|||
"clock-AF_ASH" , "clock-AF_ECONET" , "clock-AF_ATMSVC" ,
|
||||
"clock-21" , "clock-AF_SNA" , "clock-AF_IRDA" ,
|
||||
"clock-AF_PPPOX" , "clock-AF_WANPIPE" , "clock-AF_LLC" ,
|
||||
"clock-27" , "clock-28" , "clock-29" ,
|
||||
"clock-27" , "clock-28" , "clock-AF_CAN" ,
|
||||
"clock-AF_TIPC" , "clock-AF_BLUETOOTH", "clock-AF_IUCV" ,
|
||||
"clock-AF_RXRPC" , "clock-AF_MAX"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -369,7 +369,7 @@ config IP_NF_SECURITY
|
|||
tristate "Security table"
|
||||
depends on IP_NF_IPTABLES
|
||||
depends on SECURITY
|
||||
default m if NETFILTER_ADVANCED=n
|
||||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
This option adds a `security' table to iptables, for use
|
||||
with Mandatory Access Control (MAC) policy.
|
||||
|
|
|
|||
|
|
@ -3292,6 +3292,7 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
|
|||
* log. Something worked...
|
||||
*/
|
||||
sk->sk_err_soft = 0;
|
||||
icsk->icsk_probes_out = 0;
|
||||
tp->rcv_tstamp = tcp_time_stamp;
|
||||
prior_packets = tp->packets_out;
|
||||
if (!prior_packets)
|
||||
|
|
@ -3324,8 +3325,6 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
|
|||
return 1;
|
||||
|
||||
no_queue:
|
||||
icsk->icsk_probes_out = 0;
|
||||
|
||||
/* If this ack opens up a zero window, clear backoff. It was
|
||||
* being used to time the probes, and is probably far higher than
|
||||
* it needs to be for normal retransmission.
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ config IP6_NF_SECURITY
|
|||
tristate "Security table"
|
||||
depends on IP6_NF_IPTABLES
|
||||
depends on SECURITY
|
||||
default m if NETFILTER_ADVANCED=n
|
||||
depends on NETFILTER_ADVANCED
|
||||
help
|
||||
This option adds a `security' table to iptables, for use
|
||||
with Mandatory Access Control (MAC) policy.
|
||||
|
|
|
|||
|
|
@ -536,7 +536,14 @@ static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb)
|
|||
|
||||
opt.limit = q->limit;
|
||||
opt.divisor = SFQ_HASH_DIVISOR;
|
||||
opt.flows = q->limit;
|
||||
opt.flows = 0;
|
||||
if (q->tail != SFQ_DEPTH) {
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < SFQ_HASH_DIVISOR; i++)
|
||||
if (q->ht[i] != SFQ_DEPTH)
|
||||
opt.flows++;
|
||||
}
|
||||
|
||||
NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue