diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:27:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:08 -0700 |
| commit | b53f35a8093e6aed7e8e880eaa0b89a3d2fdfb0a (patch) | |
| tree | 50e19688753650e27b1f7fc1d48eb8683666e6b7 /arch/um/drivers/vde_user.c | |
| parent | cd1ae0e49bdd814cfaa2e5ab28cff21a30e20085 (diff) | |
uml: network driver MTU cleanups
A bunch of MTU-related cleanups in the network code.
First, there is the addition of the notion of a maximally-sized packet, which
is the MTU plus headers. This is used to size the skb that will receive a
packet. This allows ether_adjust_skb to go away, as it was used to resize the
skb after it was allocated.
Since the skb passed into the low-level read routine is no longer resized, and
possibly reallocated, there, they (and the write routines) don't need to get
an sk_buff **. They just need the sk_buff * now. The callers of
ether_adjust_skb still need to do the skb_put, so that's now inlined.
The MAX_PACKET definitions in most of the drivers are gone.
The set_mtu methods were all the same and did nothing, so they can be
removed.
The ethertap driver had a typo which doubled the size of the packet rather
than adding two bytes to it. It also wasn't defining its setup_size, causing
a zero-byte kmalloc and crash when the invalid pointer returned from kmalloc
was dereferenced.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/vde_user.c')
| -rw-r--r-- | arch/um/drivers/vde_user.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c index 7533cd3cbba..d9941fe5f93 100644 --- a/arch/um/drivers/vde_user.c +++ b/arch/um/drivers/vde_user.c @@ -12,8 +12,6 @@ #include "user.h" #include "vde.h" -#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER) - static int vde_user_init(void *data, void *dev) { struct vde_data *pri = data; @@ -65,20 +63,15 @@ static void vde_remove(void *data) printk(UM_KERN_WARNING "vde_remove - we have no VDECONN to remove"); } -static int vde_set_mtu(int mtu, void *data) -{ - return mtu; -} - const struct net_user_info vde_user_info = { .init = vde_user_init, .open = vde_user_open, .close = NULL, .remove = vde_remove, - .set_mtu = vde_set_mtu, .add_address = NULL, .delete_address = NULL, - .max_packet = MAX_PACKET - ETH_HEADER_OTHER + .mtu = ETH_MAX_PACKET, + .max_packet = ETH_MAX_PACKET + ETH_HEADER_OTHER, }; void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init) |