Merged to master at 94520a913884..b22dd7f89536 (from, to] You can see the entire diff with 'git diff' or at https://github.com/brho/akaros/compare/94520a913884...b22dd7f89536
On 2016-05-17 at 15:01 Dan Cross <[email protected]> wrote: > When I was in this file earlier, I noticed these: minor > cleanups with indenting communication lines and cleaning > up some spatch output that adds an extra space after the > '*' when changing 'uchar *' to 'uint8_t *'. > > Change-Id: Iea36a062f3882c53ed426e0bef18161738104003 > Signed-off-by: Dan Cross <[email protected]> > --- > kern/src/net/arp.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/kern/src/net/arp.c b/kern/src/net/arp.c > index bd5b6fc..1c240a0 100644 > --- a/kern/src/net/arp.c > +++ b/kern/src/net/arp.c > @@ -91,8 +91,8 @@ void arpinit(struct Fs *f) > /* > * create a new arp entry for an ip address. > */ > -static struct arpent *newarp6(struct arp *arp, uint8_t * ip, struct Ipifc > *ifc, > - int addrxt) > +static struct arpent *newarp6(struct arp *arp, uint8_t *ip, struct Ipifc > *ifc, > + int addrxt) > { > unsigned int t; > struct block *next, *xp; > @@ -230,7 +230,7 @@ void cleanarpent(struct arp *arp, struct arpent *a) > * waiting for ip->mac to be resolved. > */ > struct arpent *arpget(struct arp *arp, struct block *bp, int version, > - struct Ipifc *ifc, uint8_t * ip, > uint8_t * mac) > + struct Ipifc *ifc, uint8_t *ip, uint8_t *mac) > { > int hash, len; > struct arpent *a; > @@ -299,7 +299,7 @@ void arprelease(struct arp *arp, struct arpent *a) > * called with arp locked > */ > struct block *arpresolve(struct arp *arp, struct arpent *a, struct medium > *type, > - uint8_t * mac) > + uint8_t *mac) > { > struct block *bp; > struct arpent *f, **l; > @@ -330,9 +330,8 @@ struct block *arpresolve(struct arp *arp, struct arpent > *a, struct medium *type, > return bp; > } > > -void > -arpenter(struct Fs *fs, int version, uint8_t * ip, uint8_t * mac, int n, > - int refresh) > +void arpenter(struct Fs *fs, int version, uint8_t *ip, uint8_t *mac, int n, > + int refresh) > { > ERRSTACK(1); > struct arp *arp; -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
