mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
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>
This commit is contained in:
parent
cd1ae0e49b
commit
b53f35a809
19 changed files with 80 additions and 188 deletions
|
@ -19,8 +19,6 @@
|
|||
#include "um_malloc.h"
|
||||
#include "user.h"
|
||||
|
||||
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
|
||||
|
||||
enum request_type { REQ_NEW_CONTROL };
|
||||
|
||||
#define SWITCH_MAGIC 0xfeedface
|
||||
|
@ -184,18 +182,13 @@ int daemon_user_write(int fd, void *buf, int len, struct daemon_data *pri)
|
|||
return net_sendto(fd, buf, len, data_addr, sizeof(*data_addr));
|
||||
}
|
||||
|
||||
static int daemon_set_mtu(int mtu, void *data)
|
||||
{
|
||||
return mtu;
|
||||
}
|
||||
|
||||
const struct net_user_info daemon_user_info = {
|
||||
.init = daemon_user_init,
|
||||
.open = daemon_open,
|
||||
.close = NULL,
|
||||
.remove = daemon_remove,
|
||||
.set_mtu = daemon_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,
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue