diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-08-19 16:08:18 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-08-19 16:08:18 -0700 |
| commit | 1d87357a1322c2faa290452c08c7f794c0be848b (patch) | |
| tree | 6f23fc2348b7c35f6a95157b0322b95d4ec07568 /datapath/dp_dev.c | |
| parent | 8fef8c7121222233075a03d57db7e0b48d5f6be5 (diff) | |
| parent | 641a0a4ed0a79d53a52d4e78ce1d90140a768798 (diff) | |
Merge citrix into master.
Diffstat (limited to 'datapath/dp_dev.c')
| -rw-r--r-- | datapath/dp_dev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/datapath/dp_dev.c b/datapath/dp_dev.c index 069127e0..008f3f6c 100644 --- a/datapath/dp_dev.c +++ b/datapath/dp_dev.c @@ -211,16 +211,17 @@ struct net_device *dp_dev_create(struct datapath *dp, const char *dp_name, int p if (!netdev) return ERR_PTR(-ENOMEM); + dp_dev = dp_dev_priv(netdev); + dp_dev->dp = dp; + dp_dev->port_no = port_no; + dp_dev->dev = netdev; + err = register_netdevice(netdev); if (err) { free_netdev(netdev); return ERR_PTR(err); } - dp_dev = dp_dev_priv(netdev); - dp_dev->dp = dp; - dp_dev->port_no = port_no; - dp_dev->dev = netdev; return netdev; } |