diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-25 23:09:19 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-25 23:09:19 +0000 |
| commit | 0da142d54d351f490de8f3edaa07feb341d92da8 (patch) | |
| tree | 25a63c74ca565ca58f096990b4f767fc97c3a5f2 /libmachdev/net.c | |
| parent | a8133c06e5ee7f6ae66c941493b5b541dfb48b8f (diff) | |
| parent | 6dca4a19b59ba11b23cda3a72f2d43a7b38ef343 (diff) | |
Merge branch 'dde-clean' into upstream-merged
Diffstat (limited to 'libmachdev/net.c')
| -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); |