|
@@ -347,10 +347,9 @@ static void eth_configure(int n, void *init, char *mac,
|
|
|
struct uml_net *device;
|
|
|
struct net_device *dev;
|
|
|
struct uml_net_private *lp;
|
|
|
- int save, err, size;
|
|
|
+ int err, size;
|
|
|
|
|
|
- size = transport->private_size + sizeof(struct uml_net_private) +
|
|
|
- sizeof(((struct uml_net_private *) 0)->user);
|
|
|
+ size = transport->private_size + sizeof(struct uml_net_private);
|
|
|
|
|
|
device = kzalloc(sizeof(*device), GFP_KERNEL);
|
|
|
if (device == NULL) {
|
|
@@ -409,12 +408,6 @@ static void eth_configure(int n, void *init, char *mac,
|
|
|
*/
|
|
|
(*transport->kern->init)(dev, init);
|
|
|
|
|
|
- /* lp.user is the first four bytes of the transport data, which
|
|
|
- * has already been initialized. This structure assignment will
|
|
|
- * overwrite that, so we make sure that .user gets overwritten with
|
|
|
- * what it already has.
|
|
|
- */
|
|
|
- save = lp->user[0];
|
|
|
*lp = ((struct uml_net_private)
|
|
|
{ .list = LIST_HEAD_INIT(lp->list),
|
|
|
.dev = dev,
|
|
@@ -428,8 +421,7 @@ static void eth_configure(int n, void *init, char *mac,
|
|
|
.write = transport->kern->write,
|
|
|
.add_address = transport->user->add_address,
|
|
|
.delete_address = transport->user->delete_address,
|
|
|
- .set_mtu = transport->user->set_mtu,
|
|
|
- .user = { save } });
|
|
|
+ .set_mtu = transport->user->set_mtu });
|
|
|
|
|
|
init_timer(&lp->tl);
|
|
|
spin_lock_init(&lp->lock);
|