mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 19:23:20 +02:00
linux: refresh patches against 3.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31047 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
08c781ae46
commit
3a64a2209c
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/mips/ath79/machtypes.h
|
--- a/arch/mips/ath79/machtypes.h
|
||||||
+++ b/arch/mips/ath79/machtypes.h
|
+++ b/arch/mips/ath79/machtypes.h
|
||||||
@@ -51,6 +51,7 @@ enum ath79_mach_type {
|
@@ -52,6 +52,7 @@ enum ath79_mach_type {
|
||||||
ATH79_MACH_RB_493, /* Mikrotik RouterBOARD 493/493AH */
|
ATH79_MACH_RB_493, /* Mikrotik RouterBOARD 493/493AH */
|
||||||
ATH79_MACH_RB_493G, /* Mikrotik RouterBOARD 493G */
|
ATH79_MACH_RB_493G, /* Mikrotik RouterBOARD 493G */
|
||||||
ATH79_MACH_RB_750, /* MikroTik RouterBOARD 750 */
|
ATH79_MACH_RB_750, /* MikroTik RouterBOARD 750 */
|
||||||
|
@ -244,7 +244,7 @@
|
|||||||
========================
|
========================
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -4928,6 +4928,13 @@ F: drivers/scsi/osd/
|
@@ -4955,6 +4955,13 @@ F: drivers/scsi/osd/
|
||||||
F: include/scsi/osd_*
|
F: include/scsi/osd_*
|
||||||
F: fs/exofs/
|
F: fs/exofs/
|
||||||
|
|
||||||
|
@ -106,8 +106,8 @@
|
|||||||
{
|
{
|
||||||
--- a/block/partition-generic.c
|
--- a/block/partition-generic.c
|
||||||
+++ b/block/partition-generic.c
|
+++ b/block/partition-generic.c
|
||||||
@@ -514,6 +514,7 @@ rescan:
|
@@ -546,6 +546,7 @@ int invalidate_partitions(struct gendisk
|
||||||
kfree(state);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
+EXPORT_SYMBOL(rescan_partitions);
|
+EXPORT_SYMBOL(rescan_partitions);
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
netif_receive_skb);
|
netif_receive_skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -194,7 +194,7 @@ rx_handler_result_t br_handle_frame(stru
|
@@ -199,7 +199,7 @@ rx_handler_result_t br_handle_frame(stru
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Deliver packet to local host only */
|
/* Deliver packet to local host only */
|
||||||
@ -18,7 +18,7 @@
|
|||||||
NULL, br_handle_local_finish)) {
|
NULL, br_handle_local_finish)) {
|
||||||
return RX_HANDLER_CONSUMED; /* consumed by filter */
|
return RX_HANDLER_CONSUMED; /* consumed by filter */
|
||||||
} else {
|
} else {
|
||||||
@@ -219,7 +219,7 @@ forward:
|
@@ -224,7 +224,7 @@ forward:
|
||||||
if (!compare_ether_addr(p->br->dev->dev_addr, dest))
|
if (!compare_ether_addr(p->br->dev->dev_addr, dest))
|
||||||
skb->pkt_type = PACKET_HOST;
|
skb->pkt_type = PACKET_HOST;
|
||||||
|
|
||||||
@ -43,7 +43,7 @@
|
|||||||
if (vlan_tx_tag_present(skb))
|
if (vlan_tx_tag_present(skb))
|
||||||
--- a/net/bridge/br_private.h
|
--- a/net/bridge/br_private.h
|
||||||
+++ b/net/bridge/br_private.h
|
+++ b/net/bridge/br_private.h
|
||||||
@@ -492,12 +492,25 @@ static inline bool br_multicast_is_route
|
@@ -493,12 +493,25 @@ static inline bool br_multicast_is_route
|
||||||
extern int br_netfilter_init(void);
|
extern int br_netfilter_init(void);
|
||||||
extern void br_netfilter_fini(void);
|
extern void br_netfilter_fini(void);
|
||||||
extern void br_netfilter_rtable_init(struct net_bridge *);
|
extern void br_netfilter_rtable_init(struct net_bridge *);
|
||||||
|
@ -830,7 +830,7 @@
|
|||||||
+be done automatically.
|
+be done automatically.
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -3018,6 +3018,11 @@ L: linuxppc-dev@lists.ozlabs.org
|
@@ -3045,6 +3045,11 @@ L: linuxppc-dev@lists.ozlabs.org
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: drivers/tty/hvc/
|
F: drivers/tty/hvc/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user