Commit e61c4d25 authored by Vikram Narayanan's avatar Vikram Narayanan
Browse files

Remove erroneous overwrite of netdev pointer


Signed-off-by: Vikram Narayanan's avatarVikram Narayanan <vikram186@gmail.com>
parent 4b631d4c
......@@ -376,9 +376,6 @@ int register_netdevice(struct net_device *dev)
LIBLCD_ERR("thc_ipc_call");
lcd_exit(-1);
}
dev_container->other_ref.cptr = fipc_get_reg4(response);
netdev_ops_container->other_ref.cptr = fipc_get_reg1(response);
rtnl_link_ops_container->other_ref.cptr = fipc_get_reg3(response);
ret = fipc_get_reg4(response);
fipc_recv_msg_end(thc_channel_to_fipc(net_async), response);
return ret;
......@@ -826,7 +823,7 @@ int ndo_validate_addr_callee(struct fipc_message *request, struct thc_channel *c
}
LIBLCD_MSG("%s, cptr lcd %lu", __func__, netdev_ref);
LIBLCD_MSG("%s, looked up cptr lcd %lu", __func__, net_dev_container->other_ref.cptr);
LIBLCD_MSG("%s, looked up cptr lcd %p | %lu", __func__, net_dev_container, net_dev_container->other_ref.cptr);
request_cookie = thc_get_request_cookie(request);
......
......@@ -399,10 +399,11 @@ int ndo_start_xmit(struct sk_buff *skb, struct net_device *dev, struct trampolin
if (!get_current()->ptstate) {
LIBLCD_MSG("%s:Called from userland - can't process", __func__);
LCD_MAIN( {
/* LCD_MAIN( {
ret = ndo_start_xmit_user(skb, dev, hidden_args);
});
return ret;
});*/
// return for now
return 0;
}
net_dev_container = container_of(dev, struct net_device_container, net_device);
......@@ -769,7 +770,7 @@ struct rtnl_link_stats64 *ndo_get_stats64_user(struct net_device *dev,
fipc_set_reg1(request, net_dev_container->other_ref.cptr);
LIBLCD_MSG("%s, klcd netdev other ref %lu",__func__, net_dev_container->other_ref.cptr);
LIBLCD_MSG("%s, klcd netdev other ref %p | %lu",__func__, net_dev_container, net_dev_container->other_ref.cptr);
DO_FINISH_(ndo_get_stats64, {
ASYNC_({
......
Supports Markdown
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