summaryrefslogtreecommitdiff
path: root/target/linux/ixp4xx/patches-2.6.30
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-25 12:05:47 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-25 12:05:47 +0000
commit995c77809b20f5c032df27461324bab541280088 (patch)
treef533f2b41b211265ff09e38bfa77101017f1620b /target/linux/ixp4xx/patches-2.6.30
parent18ac347ebb0ab81ac4269be0324d6f475ed7acfd (diff)
ixp4xx add jumboframe fixes by Ted Hess (#5746)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17396 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.30')
-rw-r--r--target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch b/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
index 21e8f45e50..9d13cbc510 100644
--- a/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
+++ b/target/linux/ixp4xx/patches-2.6.30/304-ixp4xx_eth_jumboframe.patch
@@ -5,11 +5,11 @@
#define POOL_ALLOC_SIZE (sizeof(struct desc) * (RX_DESCS + TX_DESCS))
#define REGS_SIZE 0x1000
-#define MAX_MRU 1536 /* 0x600 */
-+#define MAX_MRU 16384
++#define MAX_MRU (16320 - ETH_HLEN - ETH_FCS_LEN)
#define RX_BUFF_SIZE ALIGN((NET_IP_ALIGN) + MAX_MRU, 4)
#define NAPI_WEIGHT 16
-@@ -1066,6 +1066,30 @@ static void destroy_queues(struct port *
+@@ -943,6 +943,32 @@
}
}
@@ -17,6 +17,8 @@
+{
+ struct port *port;
+ struct msg msg;
++ /* adjust for ethernet headers */
++ int framesize = mtu + ETH_HLEN + ETH_FCS_LEN;
+
+ port = netdev_priv(dev);
+
@@ -25,11 +27,11 @@
+ msg.eth_id = port->id;
+
+ /* max rx/tx 64 byte blocks */
-+ msg.byte2 = ((mtu + 63) / 64) << 8;
-+ msg.byte3 = ((mtu + 63) / 64) << 8;
++ msg.byte2 = ((framesize + 63) / 64) << 8;
++ msg.byte3 = ((framesize + 63) / 64) << 8;
+
-+ msg.byte4 = msg.byte6 = mtu >> 8;
-+ msg.byte5 = msg.byte7 = mtu & 0xff;
++ 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;
@@ -40,7 +42,7 @@
static int eth_open(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
-@@ -1117,6 +1141,8 @@ static int eth_open(struct net_device *d
+@@ -994,6 +1020,8 @@
if (npe_send_recv_message(port->npe, &msg, "ETH_SET_FIREWALL_MODE"))
return -EIO;
@@ -49,7 +51,7 @@
if ((err = request_queues(port)) != 0)
return err;
-@@ -1256,7 +1282,26 @@ static int eth_close(struct net_device *
+@@ -1134,7 +1162,26 @@
return 0;
}