[kernel] refresh patches for kernel 2.6.28
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14720 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
e1b6850f78
commit
2a07322e63
|
@ -56,7 +56,7 @@
|
||||||
|
|
||||||
if (skb2)
|
if (skb2)
|
||||||
kfree_skb(ret ? entry->skb : skb2);
|
kfree_skb(ret ? entry->skb : skb2);
|
||||||
@@ -248,11 +253,13 @@ static void qdisc_run_tasklet(unsigned l
|
@@ -248,11 +251,13 @@ static void qdisc_run_tasklet(unsigned l
|
||||||
{
|
{
|
||||||
struct net_device *dev = (struct net_device *)arg;
|
struct net_device *dev = (struct net_device *)arg;
|
||||||
struct imq_private *priv = netdev_priv(dev);
|
struct imq_private *priv = netdev_priv(dev);
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: linux-2.6.28.7/drivers/ssb/pci.c
|
--- a/drivers/ssb/pci.c
|
||||||
===================================================================
|
+++ b/drivers/ssb/pci.c
|
||||||
--- linux-2.6.28.7.orig/drivers/ssb/pci.c 2009-02-26 20:37:02.000000000 +0100
|
|
||||||
+++ linux-2.6.28.7/drivers/ssb/pci.c 2009-02-26 20:41:44.000000000 +0100
|
|
||||||
@@ -514,6 +514,7 @@ unsupported:
|
@@ -514,6 +514,7 @@ unsupported:
|
||||||
static int ssb_pci_sprom_get(struct ssb_bus *bus,
|
static int ssb_pci_sprom_get(struct ssb_bus *bus,
|
||||||
struct ssb_sprom *sprom)
|
struct ssb_sprom *sprom)
|
||||||
|
@ -35,10 +33,8 @@ Index: linux-2.6.28.7/drivers/ssb/pci.c
|
||||||
kfree(buf);
|
kfree(buf);
|
||||||
out:
|
out:
|
||||||
return err;
|
return err;
|
||||||
Index: linux-2.6.28.7/drivers/ssb/sprom.c
|
--- a/drivers/ssb/sprom.c
|
||||||
===================================================================
|
+++ b/drivers/ssb/sprom.c
|
||||||
--- linux-2.6.28.7.orig/drivers/ssb/sprom.c 2009-02-26 20:33:21.000000000 +0100
|
|
||||||
+++ linux-2.6.28.7/drivers/ssb/sprom.c 2009-02-26 20:52:35.000000000 +0100
|
|
||||||
@@ -14,6 +14,9 @@
|
@@ -14,6 +14,9 @@
|
||||||
#include "ssb_private.h"
|
#include "ssb_private.h"
|
||||||
|
|
||||||
|
@ -86,10 +82,8 @@ Index: linux-2.6.28.7/drivers/ssb/sprom.c
|
||||||
+{
|
+{
|
||||||
+ return fallback_sprom;
|
+ return fallback_sprom;
|
||||||
+}
|
+}
|
||||||
Index: linux-2.6.28.7/drivers/ssb/ssb_private.h
|
--- a/drivers/ssb/ssb_private.h
|
||||||
===================================================================
|
+++ b/drivers/ssb/ssb_private.h
|
||||||
--- linux-2.6.28.7.orig/drivers/ssb/ssb_private.h 2009-02-26 20:36:33.000000000 +0100
|
|
||||||
+++ linux-2.6.28.7/drivers/ssb/ssb_private.h 2009-02-26 20:36:56.000000000 +0100
|
|
||||||
@@ -131,6 +131,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
|
@@ -131,6 +131,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
|
||||||
const char *buf, size_t count,
|
const char *buf, size_t count,
|
||||||
int (*sprom_check_crc)(const u16 *sprom, size_t size),
|
int (*sprom_check_crc)(const u16 *sprom, size_t size),
|
||||||
|
@ -98,10 +92,8 @@ Index: linux-2.6.28.7/drivers/ssb/ssb_private.h
|
||||||
|
|
||||||
|
|
||||||
/* core.c */
|
/* core.c */
|
||||||
Index: linux-2.6.28.7/include/linux/ssb/ssb.h
|
--- a/include/linux/ssb/ssb.h
|
||||||
===================================================================
|
+++ b/include/linux/ssb/ssb.h
|
||||||
--- linux-2.6.28.7.orig/include/linux/ssb/ssb.h 2009-02-26 20:26:34.000000000 +0100
|
|
||||||
+++ linux-2.6.28.7/include/linux/ssb/ssb.h 2009-02-26 20:32:30.000000000 +0100
|
|
||||||
@@ -339,6 +339,10 @@ extern int ssb_bus_pcmciabus_register(st
|
@@ -339,6 +339,10 @@ extern int ssb_bus_pcmciabus_register(st
|
||||||
|
|
||||||
extern void ssb_bus_unregister(struct ssb_bus *bus);
|
extern void ssb_bus_unregister(struct ssb_bus *bus);
|
||||||
|
|
Loading…
Reference in New Issue