summaryrefslogtreecommitdiff
path: root/packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-10 01:06:43 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-10 01:06:43 +0000
commit2f0e3d2a376647127e9d569aa9d2ab0ae2211843 (patch)
treeb81909ac6d20e1eac9ede7cd68b04a32597bf213 /packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch
parenta8ba51336caf9272a41e3cd68531920333d19e75 (diff)
ixp400-eth: incorporate new patches from nslu2 CVS into 1.5
- three new patches from dwery: continue-if-qmgr-init-fails, int-random, stop-on-rmmod change to device name (eth vs ixp) handling from rwhitby so that is works on non-OE builds (plus debug code added to debug.patch) sanitise patches to make them easier to compare
Diffstat (limited to 'packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch')
-rw-r--r--packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch15
1 files changed, 10 insertions, 5 deletions
diff --git a/packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch b/packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch
index 22049c3491..64fb310ee5 100644
--- a/packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch
+++ b/packages/ixp425-eth/ixp400-eth-1.5/poll-controller.patch
@@ -1,6 +1,11 @@
---- ./ixp400_eth.c 2005-11-19 23:36:44.482912850 -0800
-+++ ./ixp400_eth.c 2005-11-19 23:39:13.080263492 -0800
-@@ -347,6 +347,12 @@ static int dev_pmu_timer_init(void);
+poll controller support
+
+ ixp400_eth.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+--- ixp400-eth/ixp400_eth.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp400-eth/ixp400_eth.c 1970-01-01 00:00:00.000000000 +0000
+@@ -348,6 +348,12 @@ static int dev_pmu_timer_init(void);
extern void
ixEthTxFrameDoneQMCallback(IxQMgrQId qId, IxQMgrCallbackId callbackId);
@@ -13,7 +18,7 @@
/* Private device data */
typedef struct {
spinlock_t lock; /* multicast management lock */
-@@ -3056,6 +3062,19 @@ static int set_mac_address(struct net_de
+@@ -3060,6 +3066,19 @@ static int set_mac_address(struct net_de
return 0;
}
@@ -33,7 +38,7 @@
/*
* TX QDISC
-@@ -3269,6 +3288,9 @@ static int __devinit dev_eth_probe(struc
+@@ -3270,6 +3289,9 @@ static int __devinit dev_eth_probe(struc
ndev->get_stats = dev_get_stats;
ndev->set_multicast_list = dev_set_multicast_list;
ndev->flags |= IFF_MULTICAST;