diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-10-03 06:16:32 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-03 06:16:32 +0000 |
| commit | 3045b0eff6c4690d4a92d84cda6a9ce9dec04e44 (patch) | |
| tree | 80e9c7d6e332fd3ec1916833386d3120496a6ad4 /packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch | |
| parent | 8ca15982a3387d4fa34e0b78382c8e2f48f3e1e4 (diff) | |
ixp4xx, ixp425-eth: add Intel Access Library 2.0, ethernet driver 1.4
NOTE: to use these you must pin ixp4xx-csr, ixp-oxal and ixp400-eth.
The name of the ethernet driver changes with this commit - it is now
ixp400-eth, not ixp425-eth - changes are required in systems which need
to use the ethernet driver and these changes are *not* in this commit.
The things to change are the image (which must now depend on ixp400-eth)
and any modprobe.conf (which, at least in NSLU2 - openslug-init - aliases
eth0 as ixp4??-eth).
Diffstat (limited to 'packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch')
| -rw-r--r-- | packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch b/packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch new file mode 100644 index 0000000000..c4c19db795 --- /dev/null +++ b/packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch @@ -0,0 +1,24 @@ +--- ./ixp400_eth.c 2005-10-01 00:50:45.179775259 -0700 ++++ ./ixp400_eth.c 2005-10-01 00:54:10.976725245 -0700 +@@ -777,7 +777,9 @@ + * before re-using it on the Rx-path + */ + skb->nfmark = 0; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) + skb->nfcache = 0; ++#endif + nf_conntrack_put(skb->nfct); + skb->nfct = NULL; + #ifdef CONFIG_NETFILTER_DEBUG +@@ -1451,7 +1453,11 @@ + skb->len -= header_len; + + /* fill the pkt arrival time (set at the irq callback entry) */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) + skb->stamp = irq_stamp; ++#else ++ skb_set_timestamp(skb, &irq_stamp); ++#endif + + /* fill the input device field */ + skb->dev = dev; |