git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a50426
)
upgrade to new signature of update_flags
author
Giuseppe Lettieri
<g.lettieri@iet.unipi.it>
Fri, 5 Jul 2013 17:53:37 +0000
(19:53 +0200)
committer
Giuseppe Lettieri
<g.lettieri@iet.unipi.it>
Fri, 5 Jul 2013 17:53:37 +0000
(19:53 +0200)
lib/netdev-pltap.c
patch
|
blob
|
history
diff --git
a/lib/netdev-pltap.c
b/lib/netdev-pltap.c
index
62f23f3
..
1e66f13
100644
(file)
--- a/
lib/netdev-pltap.c
+++ b/
lib/netdev-pltap.c
@@
-628,27
+628,27
@@
netdev_pltap_set_stats(struct netdev *netdev OVS_UNUSED, const struct netdev_sta
static int
static int
-netdev_pltap_update_flags(struct netdev
*netdev
,
+netdev_pltap_update_flags(struct netdev
_dev *dev_
,
enum netdev_flags off, enum netdev_flags on,
enum netdev_flags *old_flagsp)
{
enum netdev_flags off, enum netdev_flags on,
enum netdev_flags *old_flagsp)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(
netdev_get_dev(netdev)
);
+ struct netdev_dev_pltap *
netdev_
dev =
+ netdev_dev_pltap_cast(
dev_
);
int error = 0;
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
return EINVAL;
}
int error = 0;
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
return EINVAL;
}
- if (netdev_pltap_finalized(dev)) {
- error = get_flags(
dev, &
dev->flags);
+ if (netdev_pltap_finalized(
netdev_
dev)) {
+ error = get_flags(
netdev_dev, &netdev_
dev->flags);
}
}
- *old_flagsp = dev->flags;
- dev->new_flags |= on;
- dev->new_flags &= ~off;
- if (
dev->flags !=
dev->new_flags) {
+ *old_flagsp =
netdev_
dev->flags;
+
netdev_
dev->new_flags |= on;
+
netdev_
dev->new_flags &= ~off;
+ if (
netdev_dev->flags != netdev_
dev->new_flags) {
/* we cannot sync here, since we may be in a signal handler */
/* we cannot sync here, since we may be in a signal handler */
- sync_needed(dev);
+ sync_needed(
netdev_
dev);
}
return error;
}
return error;