Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86

[linux-2.6-omap-h63xx.git] / arch / um / include / net_user.h

diff --git a/arch/um/include/net_user.h b/arch/um/include/net_user.h
index cfe7c50634b9dd45a88a9d77bbe04dd8643fb9ff..63bee158cd8efbe2639f5a293c741ca5af1623ef 100644 (file)
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
@@ -18,10 +18,10 @@ struct net_user_info {
        int (*open)(void *);
        void (*close)(int, void *);
        void (*remove)(void *);
-       int (*set_mtu)(int mtu, void *);
        void (*add_address)(unsigned char *, unsigned char *, void *);
        void (*delete_address)(unsigned char *, unsigned char *, void *);
        int max_packet;
+       int mtu;
 };
 
 extern void ether_user_init(void *data, void *dev);