diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-25 23:10:02 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-25 23:10:02 +0000 |
| commit | f095b8d906eca183030e15b4eadeb2276501fe6c (patch) | |
| tree | e7b78ad3358c3978e65fb3c23e1bb264cc2e919f /libmachdev | |
| parent | 775fd48eafe2bdc98aa00683b4079fa5cc4093e8 (diff) | |
| parent | dc2a7e0310f420dac56957d5e5b3deb906da3cc8 (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'libmachdev')
| -rw-r--r-- | libmachdev/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmachdev/net.c b/libmachdev/net.c index 4b4cfe7c..501c9bb7 100644 --- a/libmachdev/net.c +++ b/libmachdev/net.c @@ -583,10 +583,10 @@ device_set_status(void *d, dev_flavor_t flavor, dev_status_t status, { if (flavor == NET_FLAGS) { - if (count != sizeof(short)) + if (count != 1) return D_INVALID_SIZE; - short flags = *(short *) status; + int flags = *(int *) status; struct net_data *net = (struct net_data *) d; dev_change_flags (net->dev, flags); |