diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-10-01 08:12:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-01 08:12:28 +0000 |
| commit | 24bad8ed028a8e075283c62d935dd0ec1344063e (patch) | |
| tree | 61afd310286ad1bba9bb1b4e09ad4718393f8e21 /packages/ixp425-eth/ixp425-eth-1.2/2.6.13.patch | |
| parent | 68c437628f2d561c87e6dfe2cdf07bd7bca44cd2 (diff) | |
ixp intel drivers: ixp4xx v1.5 ixp425-eth v1.2
Diffstat (limited to 'packages/ixp425-eth/ixp425-eth-1.2/2.6.13.patch')
| -rw-r--r-- | packages/ixp425-eth/ixp425-eth-1.2/2.6.13.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/packages/ixp425-eth/ixp425-eth-1.2/2.6.13.patch b/packages/ixp425-eth/ixp425-eth-1.2/2.6.13.patch new file mode 100644 index 0000000000..e5825740bb --- /dev/null +++ b/packages/ixp425-eth/ixp425-eth-1.2/2.6.13.patch @@ -0,0 +1,39 @@ +--- ./ixp425_eth.c 2005-10-01 00:45:45.180897520 -0700 ++++ ./ixp425_eth.c 2005-10-01 00:50:45.179775259 -0700 +@@ -797,7 +797,9 @@ + skb->pkt_type = PACKET_HOST; /* Default type */ + skb->ip_summed = 0; + skb->priority = 0; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) + skb->security = 0; ++#endif + #ifdef CONFIG_NET_SCHED + skb->tc_index = 0; + #endif +@@ -2564,8 +2566,14 @@ + } + + /* set port MAC addr and update the dev struct if successfull */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) + int dev_set_mac_address(struct net_device *dev, struct sockaddr *saddr) + { ++#else ++static int set_mac_address(struct net_device *dev, void *saddrIn) ++{ ++ struct sockaddr *saddr = saddrIn; ++#endif + int res; + priv_data_t *priv = dev->priv; + IxEthAccMacAddr npeMacAddr; +@@ -2700,7 +2708,11 @@ + #ifdef CONFIG_NET_POLL_CONTROLLER + ndev->poll_controller = ixp425eth_poll_controller; + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) + ndev->set_mac_address = dev_set_mac_address; ++#else ++ ndev->set_mac_address = set_mac_address; ++#endif + + TRACE; + |