Commit 11ce2ba3 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

rocker: rename rocker.c to rocker_main.c

Since "rocker.c" is going to be split into multiple files, start with
renaming original "rocker.c" file to "rocker_main.c". Multiple code
parts are going to be cut from "rocker_main.c" later on.

Fix couple of checkpatch issues on the way.
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarScott Feldman <sfeldma@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fe685f6
......@@ -3,3 +3,4 @@
#
obj-$(CONFIG_ROCKER) += rocker.o
rocker-y := rocker_main.o
/*
* drivers/net/ethernet/rocker/rocker.c - Rocker switch device driver
* Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
* Copyright (c) 2014-2016 Jiri Pirko <jiri@mellanox.com>
* Copyright (c) 2014 Scott Feldman <sfeldma@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
......@@ -922,7 +922,8 @@ static bool rocker_desc_gen(const struct rocker_desc_info *desc_info)
return comp_err & ROCKER_DMA_DESC_COMP_ERR_GEN ? true : false;
}
static void *rocker_desc_cookie_ptr_get(const struct rocker_desc_info *desc_info)
static void *
rocker_desc_cookie_ptr_get(const struct rocker_desc_info *desc_info)
{
return (void *)(uintptr_t)desc_info->desc->cookie;
}
......@@ -4595,7 +4596,8 @@ static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
vlan->flags = 0;
if (rocker_vlan_id_is_internal(htons(vid)))
vlan->flags |= BRIDGE_VLAN_INFO_PVID;
vlan->vid_begin = vlan->vid_end = vid;
vlan->vid_begin = vid;
vlan->vid_end = vid;
err = cb(&vlan->obj);
if (err)
break;
......@@ -5333,7 +5335,6 @@ static int rocker_port_bridge_leave(struct rocker_port *rocker_port)
return err;
}
static int rocker_port_ovs_changed(struct rocker_port *rocker_port,
struct net_device *master)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment