diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-08 15:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-08 15:38:43 -0400 |
| commit | 67b5b21f389502c3fb18b46d4fa9d02c38982fce (patch) | |
| tree | 110ec75879f5ebe3509e702d4063d07b79526458 /net/core/devlink.c | |
| parent | 24d390b2acea6c8cd7c95a9204f23eb15cec8269 (diff) | |
| parent | 9efc8f655c8488c6ee2f7d5034826880bf5b4bba (diff) | |
Merge branch 'mlxsw-next'
Jiri Pirko says:
====================
mlxsw: small driver update + one tiny devlink dependency
Cosmetics, in preparation to sharedbuffer patchset.
First patch is here to allow patch number two.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/devlink.c')
| -rw-r--r-- | net/core/devlink.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 590fa561cb7f..44f880d3b816 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -630,7 +630,6 @@ int devlink_port_register(struct devlink *devlink, } devlink_port->devlink = devlink; devlink_port->index = port_index; - devlink_port->type = DEVLINK_PORT_TYPE_NOTSET; devlink_port->registered = true; list_add_tail(&devlink_port->list, &devlink->port_list); mutex_unlock(&devlink_port_mutex); |