Merge branch 'mainstream'

[sliver-openvswitch.git] / lib / netdev-dummy.c

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 6aa4084..4e97f55 100644 (file)
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -319,6 +319,7 @@ static const struct netdev_class dummy_class = {
     netdev_dummy_destroy,
     NULL,                       /* get_config */
     NULL,                       /* set_config */
+    NULL,                       /* get_tunnel_config */
 
     netdev_dummy_open,
     netdev_dummy_close,
@@ -362,7 +363,7 @@ static const struct netdev_class dummy_class = {
     NULL,                       /* get_in6 */
     NULL,                       /* add_router */
     NULL,                       /* get_next_hop */
-    NULL,                       /* get_drv_info */
+    NULL,                       /* get_status */
     NULL,                       /* arp_lookup */
 
     netdev_dummy_update_flags,