Skip to content

Commit 5cf053f

Browse files
Avinash Repakagerd-rausch
authored andcommitted
RDS: IB: Remove gid from rds_ib_port array
This patch removes gid from rds_ib_port array as it is unused. Orabug: 26096238 Signed-off-by: Avinash Repaka <[email protected]> Tested-by: Gerald Gibson <[email protected]> Reviewed-by: Sudhakar Dindukurti <[email protected]> Signed-off-by: Aron Silverton <[email protected]> Signed-off-by: Somasundaram Krishnasamy <[email protected]>
1 parent 38ca097 commit 5cf053f

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

net/rds/ib.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,6 @@ static int rds_ib_move_ip4(char *from_dev,
10261026
static u8 rds_ib_init_port(struct rds_ib_device *rds_ibdev,
10271027
struct net_device *net_dev,
10281028
u8 port_num,
1029-
union ib_gid gid,
10301029
uint16_t pkey)
10311030
{
10321031
const char *digits = "0123456789";
@@ -1055,7 +1054,6 @@ static u8 rds_ib_init_port(struct rds_ib_device *rds_ibdev,
10551054
ip_config[next_port_idx].rds_ibdev = rds_ibdev;
10561055
ip_config[next_port_idx].ip_active_port = 0;
10571056
strcpy(ip_config[next_port_idx].if_name, net_dev->name);
1058-
memcpy(&ip_config[next_port_idx].gid, &gid, sizeof(union ib_gid));
10591057
ip_config[next_port_idx].pkey = pkey;
10601058
ip_config[next_port_idx].port_state = RDS_IB_PORT_INIT;
10611059
ip_config[next_port_idx].port_layerflags = 0x0; /* all clear to begin */
@@ -2155,12 +2153,11 @@ static int rds_ib_ip_config_init(void)
21552153
}
21562154

21572155
if (ret) {
2158-
printk(KERN_ERR "RDS/IB: GID "RDS_IB_GID_FMT
2159-
" has no associated port\n",
2160-
RDS_IB_GID_ARG(gid));
2156+
pr_err("RDS/IB: netdevice %s has no associated ibdevice\n",
2157+
dev->name);
21612158
} else {
21622159
port = rds_ib_init_port(rds_ibdev, dev,
2163-
port_num, gid, pkey);
2160+
port_num, pkey);
21642161
if (port > 0) {
21652162
if (in_dev)
21662163
rds_ib_set_port4(dev, in_dev,
@@ -2647,12 +2644,11 @@ static void rds_ib_addintf_after_initscripts(struct work_struct *_work)
26472644
break;
26482645
}
26492646
if (ret) {
2650-
printk(KERN_ERR "RDS/IB: GID "RDS_IB_GID_FMT
2651-
" has no associated port\n",
2652-
RDS_IB_GID_ARG(gid));
2647+
pr_err("RDS/IB: netdevice %s has no associated ibdevice\n",
2648+
ndev->name);
26532649
} else {
26542650
port = rds_ib_init_port(rds_ibdev, ndev,
2655-
port_num, gid, pkey);
2651+
port_num, pkey);
26562652
if (port > 0) {
26572653
if (in_dev)
26582654
rds_ib_set_port4(ndev, in_dev, port);

0 commit comments

Comments
 (0)