diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-07-03 17:51:44 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-07-03 17:51:44 +0000 |
commit | a3a701aee78c83256c6609001f68af77accb6e5d (patch) | |
tree | 0084984d4a1a146ca4025bdd87b585dd2e299607 /target/linux/ixp4xx/patches-3.3/304-ixp4xx_eth_jumboframe.patch | |
parent | 426c0e060b520e066fe5aaddcee9d5917b390f2f (diff) | |
download | upstream-a3a701aee78c83256c6609001f68af77accb6e5d.tar.gz upstream-a3a701aee78c83256c6609001f68af77accb6e5d.tar.bz2 upstream-a3a701aee78c83256c6609001f68af77accb6e5d.zip |
ixp4xx: switch to kernel 3.10
Fixes network issues at least on NSLU2 (#13801).
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37153 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-3.3/304-ixp4xx_eth_jumboframe.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-3.3/304-ixp4xx_eth_jumboframe.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/target/linux/ixp4xx/patches-3.3/304-ixp4xx_eth_jumboframe.patch b/target/linux/ixp4xx/patches-3.3/304-ixp4xx_eth_jumboframe.patch deleted file mode 100644 index f215fc9628..0000000000 --- a/target/linux/ixp4xx/patches-3.3/304-ixp4xx_eth_jumboframe.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/drivers/net/ethernet/xscale/ixp4xx_eth.c -+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c -@@ -57,7 +57,7 @@ - - #define POOL_ALLOC_SIZE (sizeof(struct desc) * (RX_DESCS + TX_DESCS)) - #define REGS_SIZE 0x1000 --#define MAX_MRU 1536 /* 0x600 */ -+#define MAX_MRU (14320 - ETH_HLEN - ETH_FCS_LEN) - #define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4) - - #define NAPI_WEIGHT 16 -@@ -1261,6 +1261,32 @@ static void destroy_queues(struct port * - } - } - -+static int eth_do_change_mtu(struct net_device *dev, int mtu) -+{ -+ struct port *port; -+ struct msg msg; -+ /* adjust for ethernet headers */ -+ int framesize = mtu + ETH_HLEN + ETH_FCS_LEN; -+ -+ port = netdev_priv(dev); -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.cmd = NPE_SETMAXFRAMELENGTHS; -+ msg.eth_id = port->id; -+ -+ /* max rx/tx 64 byte blocks */ -+ msg.byte2 = ((framesize + 63) / 64) << 8; -+ msg.byte3 = ((framesize + 63) / 64) << 8; -+ -+ msg.byte4 = msg.byte6 = framesize >> 8; -+ msg.byte5 = msg.byte7 = framesize & 0xff; -+ -+ if (npe_send_recv_message(port->npe, &msg, "ETH_SET_MAX_FRAME_LENGTH")) -+ return -EIO; -+ -+ return 0; -+} -+ - static int eth_open(struct net_device *dev) - { - struct port *port = netdev_priv(dev); -@@ -1312,6 +1338,8 @@ static int eth_open(struct net_device *d - if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE")) - return -EIO; - -+ eth_do_change_mtu(dev, dev->mtu); -+ - if ((err = request_queues(port)) != 0) - return err; - -@@ -1451,7 +1479,26 @@ static int eth_close(struct net_device * - return 0; - } - -+static int ixp_eth_change_mtu(struct net_device *dev, int mtu) -+{ -+ int ret; -+ -+ if (mtu > MAX_MRU) -+ return -EINVAL; -+ -+ if (dev->flags & IFF_UP) { -+ ret = eth_do_change_mtu(dev, mtu); -+ if (ret < 0) -+ return ret; -+ } -+ -+ dev->mtu = mtu; -+ -+ return 0; -+} -+ - static const struct net_device_ops ixp4xx_netdev_ops = { -+ .ndo_change_mtu = ixp_eth_change_mtu, - .ndo_open = eth_open, - .ndo_stop = eth_close, - .ndo_start_xmit = eth_xmit, |