@@ -1026,7 +1026,6 @@ static int rds_ib_move_ip4(char *from_dev,
1026
1026
static u8 rds_ib_init_port (struct rds_ib_device * rds_ibdev ,
1027
1027
struct net_device * net_dev ,
1028
1028
u8 port_num ,
1029
- union ib_gid gid ,
1030
1029
uint16_t pkey )
1031
1030
{
1032
1031
const char * digits = "0123456789" ;
@@ -1055,7 +1054,6 @@ static u8 rds_ib_init_port(struct rds_ib_device *rds_ibdev,
1055
1054
ip_config [next_port_idx ].rds_ibdev = rds_ibdev ;
1056
1055
ip_config [next_port_idx ].ip_active_port = 0 ;
1057
1056
strcpy (ip_config [next_port_idx ].if_name , net_dev -> name );
1058
- memcpy (& ip_config [next_port_idx ].gid , & gid , sizeof (union ib_gid ));
1059
1057
ip_config [next_port_idx ].pkey = pkey ;
1060
1058
ip_config [next_port_idx ].port_state = RDS_IB_PORT_INIT ;
1061
1059
ip_config [next_port_idx ].port_layerflags = 0x0 ; /* all clear to begin */
@@ -2155,12 +2153,11 @@ static int rds_ib_ip_config_init(void)
2155
2153
}
2156
2154
2157
2155
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 );
2161
2158
} else {
2162
2159
port = rds_ib_init_port (rds_ibdev , dev ,
2163
- port_num , gid , pkey );
2160
+ port_num , pkey );
2164
2161
if (port > 0 ) {
2165
2162
if (in_dev )
2166
2163
rds_ib_set_port4 (dev , in_dev ,
@@ -2647,12 +2644,11 @@ static void rds_ib_addintf_after_initscripts(struct work_struct *_work)
2647
2644
break ;
2648
2645
}
2649
2646
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 );
2653
2649
} else {
2654
2650
port = rds_ib_init_port (rds_ibdev , ndev ,
2655
- port_num , gid , pkey );
2651
+ port_num , pkey );
2656
2652
if (port > 0 ) {
2657
2653
if (in_dev )
2658
2654
rds_ib_set_port4 (ndev , in_dev , port );
0 commit comments