diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /networking/ether-wake.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'networking/ether-wake.c')
| -rw-r--r-- | networking/ether-wake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ether-wake.c b/networking/ether-wake.c index 121f15366..8f1479c02 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c | |||
| @@ -189,12 +189,12 @@ int ether_wake_main(int argc UNUSED_PARAM, char **argv) | |||
| 189 | unsigned flags; | 189 | unsigned flags; |
| 190 | unsigned char wol_passwd[6]; | 190 | unsigned char wol_passwd[6]; |
| 191 | int wol_passwd_sz = 0; | 191 | int wol_passwd_sz = 0; |
| 192 | int s; /* Raw socket */ | 192 | int s; /* Raw socket */ |
| 193 | int pktsize; | 193 | int pktsize; |
| 194 | unsigned char outpack[1000]; | 194 | unsigned char outpack[1000]; |
| 195 | 195 | ||
| 196 | struct ether_addr eaddr; | 196 | struct ether_addr eaddr; |
| 197 | struct whereto_t whereto; /* who to wake up */ | 197 | struct whereto_t whereto; /* who to wake up */ |
| 198 | 198 | ||
| 199 | /* handle misc user options */ | 199 | /* handle misc user options */ |
| 200 | opt_complementary = "=1"; | 200 | opt_complementary = "=1"; |