Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vmnetInt.h & bridge.c #300

Open
wants to merge 1 commit into
base: workstation-17.5.1
Choose a base branch
from
Open

Update vmnetInt.h & bridge.c #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions vmnet-only/bridge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,10 @@ VNetBridgeReceiveFromVNet(VNetJack *this, // IN: jack
* and the packet size is not too big.
*/

dev_lock_list();
read_lock_list();
if (MAC_EQ(dest, dev->dev_addr) ||
skb->len > dev->mtu + dev->hard_header_len) {
dev_unlock_list();
read_unlock_list();
} else {
# if 0 // XXX we should do header translation
if ((dev->flags & IFF_SOFTHEADERS) != 0) {
Expand All @@ -607,15 +607,15 @@ VNetBridgeReceiveFromVNet(VNetJack *this, // IN: jack
# endif
clone = skb_clone(skb, GFP_ATOMIC);
if (clone == NULL) {
dev_unlock_list();
read_unlock_list();
} else {
skb_set_owner_w(clone, bridge->sk);
clone->protocol = ((struct ethhdr *)skb->data)->h_proto; // XXX
if ((dev->flags & IFF_UP) != 0) {
dev_unlock_list();
read_unlock_list();
DEV_QUEUE_XMIT(clone, dev, 0);
} else {
dev_unlock_list();
read_unlock_list();
dev_kfree_skb(clone);
}
}
Expand Down Expand Up @@ -899,27 +899,27 @@ VNetBridgeUp(VNetBridge *bridge, // IN: bridge struct
* Get peer device structure
*/

dev_lock_list();
read_lock_list();
bridge->dev = __dev_get_by_name(&init_net, bridge->name);
LOG(2, (KERN_DEBUG "bridge-%s: got dev %p\n",
bridge->name, bridge->dev));
if (bridge->dev == NULL) {
dev_unlock_list();
read_unlock_list();
retval = -ENODEV;
goto out;
}
if (!(bridge->dev->flags & IFF_UP)) {
LOG(2, (KERN_DEBUG "bridge-%s: interface %s is not up\n",
bridge->name, bridge->dev->name));
dev_unlock_list();
read_unlock_list();
retval = -ENODEV;
goto out;
}
if (bridge->dev->type != ARPHRD_ETHER) {
LOG(1, (KERN_DEBUG "bridge-%s: can't bridge with %s (header length %d, "
"type %d).\n", bridge->name, bridge->dev->name,
bridge->dev->hard_header_len, bridge->dev->type));
dev_unlock_list();
read_unlock_list();
retval = -EINVAL;
goto out;
}
Expand All @@ -933,7 +933,7 @@ VNetBridgeUp(VNetBridge *bridge, // IN: bridge struct

bridge->sk = compat_sk_alloc(bridge, GFP_ATOMIC);
if (bridge->sk == NULL) {
dev_unlock_list();
read_unlock_list();
retval = -ENOMEM;
goto out;
}
Expand Down Expand Up @@ -973,7 +973,7 @@ VNetBridgeUp(VNetBridge *bridge, // IN: bridge struct
bridge->pt.af_packet_priv = bridge->sk;
bridge->enabledPromisc = FALSE;
dev_add_pack(&bridge->pt);
dev_unlock_list();
read_unlock_list();

/*
* Put in promiscuous mode if need be.
Expand Down
4 changes: 2 additions & 2 deletions vmnet-only/vmnetInt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
compat_skb_set_network_header(skb, sizeof (struct ethhdr)), \
dev_queue_xmit(skb) \
)
#define dev_lock_list() read_lock(&dev_base_lock)
#define dev_unlock_list() read_unlock(&dev_base_lock)
#define read_lock_list() rcu_read_lock()
#define read_unlock_list() rcu_read_unlock()


extern struct proto vmnet_proto;
Expand Down