Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

path: root/stun.h

#ifndef STUN_H
#define STUN_H

extern int print_stun_probe(char *server, int sport, int tport);

#endif /* STUN_H */