tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 3a50b65f: Merge "Fix <net/route.h>."

Browse source 
* commit '3a50b65fd152b4a50dc15ec33f19080e8724b02c':
  Fix <net/route.h>.
This commit is contained in:
Elliott Hughes 2014-12-16 16:58:33 +00:00 committed by Android Git Automerger
commit 48bc703a3c
3 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libc/include/net/ethernet.h
View file

@ -25,8 +25,11 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _NET_ETHERNET_H_
#define _NET_IF_ETHERNET_H_
#define _NET_ETHERNET_H_
#include <linux/if_ether.h>
#include <net/if_ether.h>
#endif /* !_NET_ETHERNET_H_ */
#endif

6
libc/include/net/if.h
View file

@ -26,9 +26,13 @@
* SUCH DAMAGE.
*/
#ifndef _NET_IF_H_
#define _NET_IF_H_
#include <sys/socket.h>
#include <linux/if.h>
#include <sys/cdefs.h>
#ifndef IF_NAMESIZE
#define IF_NAMESIZE IFNAMSIZ
#endif
@ -42,3 +46,5 @@ extern unsigned int if_nametoindex(const char *);
extern char* if_indextoname(unsigned ifindex, char *ifname);
__END_DECLS
#endif

35
libc/include/net/route.h
View file

@ -1,2 +1,37 @@
/*
* Copyright (C) 2014 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _NET_ROUTE_H_
#define _NET_ROUTE_H_
#include <sys/socket.h>
#include <linux/route.h>
#include <linux/in6.h>
#include <linux/ipv6_route.h>
#endif