refresh 2.6.32 patches with -rc8

SVN-Revision: 18613
This commit is contained in:
Imre Kaloz 2009-11-30 11:45:37 +00:00
parent bf8db0ded6
commit cbae183c9e
4 changed files with 8 additions and 8 deletions

View File

@ -132,7 +132,7 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -839,6 +839,9 @@ config MIPS_DISABLE_OBSOLETE_IDE @@ -840,6 +840,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K config SYNC_R4K
bool bool

View File

@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -842,6 +842,10 @@ config SYNC_R4K @@ -843,6 +843,10 @@ config SYNC_R4K
config MIPS_MACHINE config MIPS_MACHINE
def_bool n def_bool n

View File

@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
-- --
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -827,6 +827,17 @@ config I8259 @@ -828,6 +828,17 @@ config I8259
config MIPS_BONITO64 config MIPS_BONITO64
bool bool
@ -71,7 +71,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
/* Control registers */ /* Control registers */
#define FPCREG_RID 0 /* $0 = revision id */ #define FPCREG_RID 0 /* $0 = revision id */
@@ -1273,6 +1275,13 @@ int fpu_emulator_cop1Handler(struct pt_r @@ -1274,6 +1276,13 @@ int fpu_emulator_cop1Handler(struct pt_r
return sig; return sig;
} }

View File

@ -834,7 +834,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/stat.h> #include <linux/stat.h>
@@ -1703,7 +1706,11 @@ int dev_hard_start_xmit(struct sk_buff * @@ -1704,7 +1707,11 @@ int dev_hard_start_xmit(struct sk_buff *
int rc; int rc;
if (likely(!skb->next)) { if (likely(!skb->next)) {
@ -847,7 +847,7 @@
dev_queue_xmit_nit(skb, dev); dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) { if (netif_needs_gso(dev, skb)) {
@@ -1788,8 +1795,7 @@ u16 skb_tx_hash(const struct net_device @@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device
} }
EXPORT_SYMBOL(skb_tx_hash); EXPORT_SYMBOL(skb_tx_hash);
@ -857,7 +857,7 @@
{ {
const struct net_device_ops *ops = dev->netdev_ops; const struct net_device_ops *ops = dev->netdev_ops;
u16 queue_index = 0; u16 queue_index = 0;
@@ -1802,6 +1808,7 @@ static struct netdev_queue *dev_pick_tx( @@ -1803,6 +1809,7 @@ static struct netdev_queue *dev_pick_tx(
skb_set_queue_mapping(skb, queue_index); skb_set_queue_mapping(skb, queue_index);
return netdev_get_tx_queue(dev, queue_index); return netdev_get_tx_queue(dev, queue_index);
} }
@ -1033,7 +1033,7 @@
new->csum = old->csum; new->csum = old->csum;
new->local_df = old->local_df; new->local_df = old->local_df;
new->pkt_type = old->pkt_type; new->pkt_type = old->pkt_type;
@@ -2775,6 +2864,13 @@ void __init skb_init(void) @@ -2776,6 +2865,13 @@ void __init skb_init(void)
0, 0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL); NULL);