diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-08 15:37:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-08 15:37:18 +1100 |
| commit | 382bd41bfbc18549c3d8896971c81baaba7eef35 (patch) | |
| tree | 7540b2e732f767fa2b2cc7eaaff04edc272f8957 /drivers/staging/batman-adv/packet.h | |
| parent | 075ac84a8fc1568a0d22af872e458b4cc7d72de8 (diff) | |
| parent | 7037d739b35c563f22a4c6281fa5d4e5e56d68f7 (diff) | |
Merge branch 'quilt/staging'
Diffstat (limited to 'drivers/staging/batman-adv/packet.h')
| -rw-r--r-- | drivers/staging/batman-adv/packet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/batman-adv/packet.h b/drivers/staging/batman-adv/packet.h index 5627ca326018..ad006ce8b131 100644 --- a/drivers/staging/batman-adv/packet.h +++ b/drivers/staging/batman-adv/packet.h @@ -90,7 +90,7 @@ struct vis_packet { uint8_t entries; /* number of entries behind this struct */ uint8_t ttl; /* TTL */ uint8_t vis_orig[6]; /* originator that informs about its - * neighbours */ + * neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ } __attribute__((packed)); |